diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-04 21:54:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-05 08:17:40 +0100 |
| commit | 7a9fe4d735207160b1458b4dd480cc089a8b7153 (patch) | |
| tree | b2c513a34fc22b17824d73fbd53debdaab3e6f4f /external/gpgmepp | |
| parent | fix compile of salcall plugin (diff) | |
| download | core-7a9fe4d735207160b1458b4dd480cc089a8b7153.tar.gz core-7a9fe4d735207160b1458b4dd480cc089a8b7153.zip | |
tdf#114086: Fix macOS paths of external GPG libraries
Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7
Reviewed-on: https://gerrit.libreoffice.org/45825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/gpgmepp')
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 806cd6817e3b..73a0ad68e6cd 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -63,7 +63,13 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/lang/cpp/src/.libs/libgpgmepp.6.dylib \ + $(EXTERNAL_WORKDIR)/src/.libs/libgpgme.11.dylib \ + ) \ ) endif |