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/libassuan | |
| 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/libassuan')
| -rw-r--r-- | external/libassuan/ExternalPackage_libassuan.mk | 20 | ||||
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 4 | ||||
| -rw-r--r-- | external/libassuan/Module_libassuan.mk | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk new file mode 100644 index 000000000000..490869a531b3 --- /dev/null +++ b/external/libassuan/ExternalPackage_libassuan.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,libassuan,libassuan)) + +$(eval $(call gb_ExternalPackage_use_external_project,libassuan,libassuan)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.7.3)) + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index af1ffe9d4af9..bcfc08a82cca 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -25,6 +25,10 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): && ./configure \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ + $(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/libassuan/Module_libassuan.mk b/external/libassuan/Module_libassuan.mk index 67e1b46575c3..45ada66ee055 100644 --- a/external/libassuan/Module_libassuan.mk +++ b/external/libassuan/Module_libassuan.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,libassuan)) $(eval $(call gb_Module_add_targets,libassuan,\ ExternalProject_libassuan \ + ExternalPackage_libassuan \ UnpackedTarball_libassuan \ )) |