Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
7d93bb8f
Kaydet (Commit)
7d93bb8f
authored
Ock 13, 2016
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
build liblangtag as shared lib on linux and OS X
Change-Id: I3ae138d1a06d22be42a3cd6f565fba6950208fc6
üst
2653ffec
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
6 deletions
+73
-6
RepositoryExternal.mk
RepositoryExternal.mk
+20
-0
ExternalPackage_liblangtag.mk
external/liblangtag/ExternalPackage_liblangtag.mk
+20
-0
ExternalProject_langtag.mk
external/liblangtag/ExternalProject_langtag.mk
+8
-1
Module_liblangtag.mk
external/liblangtag/Module_liblangtag.mk
+8
-1
UnpackedTarball_langtag.mk
external/liblangtag/UnpackedTarball_langtag.mk
+7
-4
liblangtag-bundled-soname.patch.0
external/liblangtag/liblangtag-bundled-soname.patch.0
+10
-0
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
7d93bb8f
...
...
@@ -1042,6 +1042,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
liblangtag_data \
))
ifeq ($(COM),MSC)
define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_set_include,$(1),\
$(LIBLANGTAG_CFLAGS) \
...
...
@@ -1052,6 +1054,24 @@ $(call gb_LinkTarget_use_external_project,$(1),langtag)
endef
else
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
liblangtag \
))
define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_set_include,$(1),\
$(LIBLANGTAG_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
$(call gb_LinkTarget_use_package,$(1),liblangtag)
endef
endif # MSC
define gb_ExternalProject__use_liblangtag
$(call gb_ExternalProject_use_external_project,$(1),langtag)
...
...
external/liblangtag/ExternalPackage_liblangtag.mk
0 → 100644
Dosyayı görüntüle @
7d93bb8f
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag,langtag))
$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,langtag))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))
else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.3.1))
endif
# vim: set noet sw=4 ts=4:
external/liblangtag/ExternalProject_langtag.mk
Dosyayı görüntüle @
7d93bb8f
...
...
@@ -22,7 +22,10 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\
# Results in "cl : Command line error D8003 : missing source filename"
$(call gb_ExternalProject_get_state_target,langtag,build):
$(call gb_ExternalProject_run,build,\
MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --with-pic \
$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
--disable-shared --enable-static, \
--enable-shared --disable-static) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
...
...
@@ -38,5 +41,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(verbose),V=1) \
$(gb_Helper_set_ld_path) \
$(MAKE) \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
) \
)
# vim: set noet sw=4 ts=4:
external/liblangtag/Module_liblangtag.mk
Dosyayı görüntüle @
7d93bb8f
...
...
@@ -11,8 +11,15 @@ $(eval $(call gb_Module_Module,liblangtag))
$(eval $(call gb_Module_add_targets,liblangtag,\
UnpackedTarball_langtag \
ExternalProject_langtag \
ExternalPackage_liblangtag_data \
ExternalProject_langtag \
))
ifneq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,liblangtag,\
ExternalPackage_liblangtag \
))
endif
# vim: set noet sw=4 ts=4:
external/liblangtag/UnpackedTarball_langtag.mk
Dosyayı görüntüle @
7d93bb8f
...
...
@@ -15,10 +15,13 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
$(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
))
# Currently no patches applied, if there were it would be:
#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
# external/liblangtag/your-modification.patch \
#))
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
external/liblangtag/liblangtag-bundled-soname.patch.0 \
))
endif
endif
ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
...
...
external/liblangtag/liblangtag-bundled-soname.patch.0
0 → 100644
Dosyayı görüntüle @
7d93bb8f
--- liblangtag/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200
+++ liblangtag/Makefile.in 2015-08-07 11:58:11.818741799 +0200
@@ -638,6 +638,7 @@
liblangtag_la_LDFLAGS = \
$(LDFLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release lo \
$(NULL)
all: $(BUILT_SOURCES)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment