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/ExternalProject_libassuan.mk | |
| parent | Revert "tdf#99352: ensure ChartController is disposing its VclPtrs on DeInitVCL" (diff) | |
| download | core-1f873596eded3d858c9ed97b988ccc5a0c1ef807.tar.gz core-1f873596eded3d858c9ed97b988ccc5a0c1ef807.zip | |
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/ExternalProject_libassuan.mk')
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 4 |
1 files changed, 4 insertions, 0 deletions
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) \ ) |