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/libassuan | |
| parent | 720cc05a76510964b779a30366d48fb854984d06 (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>
Diffstat (limited to 'external/libassuan')
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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 |