diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-03-05 03:45:58 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-03-05 09:56:56 +0000 |
| commit | 1f873596eded3d858c9ed97b988ccc5a0c1ef807 (patch) | |
| tree | a296112df0d2b59afcd3b6883ab1f4b8bc9c4e65 /external/libgpg-error | |
| parent | 60708af4a7ed48028cf3158d1101568aa5b0da81 (diff) | |
gpg4libre: get rpath right for gpgme
Also add initial crossbuild support, and avoid extraneous build
targets (docs, arcane lang support)
Change-Id: I51afa2ff91c576b35dcb73124396188b780ed84e
Reviewed-on: https://gerrit.libreoffice.org/34898
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external/libgpg-error')
5 files changed, 42 insertions, 0 deletions
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk new file mode 100644 index 000000000000..ba6e8c67f754 --- /dev/null +++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk @@ -0,0 +1,20 @@ +# -*- 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,libgpg-error,libgpg-error)) + +$(eval $(call gb_ExternalPackage_use_external_project,libgpg-error,libgpg-error)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.21.0)) + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 107babb80676..34a87c546f4e 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -18,6 +18,13 @@ $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)) $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure \ + --disable-rpath \ + --disable-languages \ + --disable-doc \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/Module_libgpg-error.mk b/external/libgpg-error/Module_libgpg-error.mk index bbebcfb6949a..0079dcba9880 100644 --- a/external/libgpg-error/Module_libgpg-error.mk +++ b/external/libgpg-error/Module_libgpg-error.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,libgpg-error)) $(eval $(call gb_Module_add_targets,libgpg-error,\ ExternalProject_libgpg-error \ + ExternalPackage_libgpg-error \ UnpackedTarball_libgpg-error \ )) diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index b2f425270eaf..4606e80e860c 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0)) $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \ external/libgpg-error/fix-autoconf-macros.patch \ + external/libgpg-error/disable-rpath-option.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/disable-rpath-option.patch b/external/libgpg-error/disable-rpath-option.patch new file mode 100644 index 000000000000..b039b689e9ed --- /dev/null +++ b/external/libgpg-error/disable-rpath-option.patch @@ -0,0 +1,13 @@ +diff -ur libgpg-error.org/configure.ac libgpg-error/configure.ac +--- configure.ac 2017-03-05 01:27:38.249210887 +0100 ++++ configure.ac~ 2017-03-05 01:29:36.820894687 +0100 +@@ -404,6 +404,9 @@ + CFLAGS="$CFLAGS -fvisibility=hidden" + fi + ++# permit disabling rpath ++AC_LIB_RPATH ++ + # + # Check whether ld supports a version script. + # (Actually not a check but a list of systems which are known to support it.) |