Attachment 138189 Details for Bug 114086 – proposition of patch to correct the installation of libassuan, gpgmepp, gpg-error

[patch] proposition of patch to correct the installation of libassuan, gpgmepp, gpg-error

libreoffice_build.patch (text/plain), 1.99 KB, created by osnola on 2017-12-03 09:24:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: osnola

Created: 2017-12-03 09:24:19 UTC

Size: 1.99 KB

patch

obsolete

>diff --git external/gpgmepp/ExternalProject_gpgmepp.mk external/gpgmepp/ExternalProject_gpgmepp.mk
>index 7aaa42a12b40..64daf5886d8a 100644
>--- external/gpgmepp/ExternalProject_gpgmepp.mk
>+++ external/gpgmepp/ExternalProject_gpgmepp.mk
>@@ -57,6 +57,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
> 					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
> 				$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
> 				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
>+                   $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
> 		   $(if $(filter LINUX,$(OS)), \
> 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
> 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
>diff --git external/libassuan/ExternalProject_libassuan.mk external/libassuan/ExternalProject_libassuan.mk
>index fdadb2851042..c01c49fc4b67 100644
>--- external/libassuan/ExternalProject_libassuan.mk
>+++ external/libassuan/ExternalProject_libassuan.mk
>@@ -47,6 +47,7 @@ $(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) \
> 	)
> 
>diff --git external/libgpg-error/ExternalProject_libgpg-error.mk external/libgpg-error/ExternalProject_libgpg-error.mk
>index ecb96f00b496..968a8dd2667f 100644
>--- external/libgpg-error/ExternalProject_libgpg-error.mk
>+++ external/libgpg-error/ExternalProject_libgpg-error.mk
>@@ -46,6 +46,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) \
> 	)
>

Actions: View

Attachments on bug 114086: 138189