external/gpgmepp/ExternalProject_gpgmepp.mk | 6 ++++++
external/libassuan/ExternalProject_libassuan.mk | 5 +++++
external/libgpg-error/ExternalProject_libgpg-error.mk | 1 +
3 files changed, 12 insertions(+)
New commits:
commit a4afd0af152403cd344cdd7fd8e2c99c01964099
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Dec 4 21:54:48 2017 +0100
tdf#114086: Fix macOS paths of external GPG libraries
Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7
Reviewed-on: https://gerrit.libreoffice.org/45825
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 7a9fe4d735207160b1458b4dd480cc089a8b7153)
Reviewed-on: https://gerrit.libreoffice.org/45840
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) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
