Kaydet (Commit) 7a9fe4d7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

tdf#114086: Fix macOS paths of external GPG libraries

Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7
Reviewed-on: https://gerrit.libreoffice.org/45825Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 720cc05a
......@@ -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
......
......@@ -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
......
......@@ -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) \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment