diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-04 21:54:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-05 12:26:38 +0100 |
| commit | a4afd0af152403cd344cdd7fd8e2c99c01964099 (patch) | |
| tree | 6b7c428e787cd6c9bc1f95567a0dc4861eb147e9 | |
| parent | 2d6068e2746d5d94cb8732fd12d0f241223f278d (diff) | |
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>
(cherry picked from commit 7a9fe4d735207160b1458b4dd480cc089a8b7153)
Reviewed-on: https://gerrit.libreoffice.org/45840
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 6 | ||||
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 5 | ||||
| -rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 1 |
3 files changed, 12 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 diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index f477280c0172..8162d6339411 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -48,7 +48,12 @@ $(call gb_ExternalProject_get_state_target,libassuan,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)/src/.libs/libassuan.0.dylib \ + ) \ ) endif diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index efd13f2c02e4..6c437ef8c884 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -44,6 +44,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): CPPFLAGS=" $(SOLARINC)" \ $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) \ ) |