Rebased ref, commits from common ancestor:
commit 731010a3124c92458be5c7c4839e8804d1c32463
Author: Christian Lohmaier <[email protected]>
AuthorDate: Sat May 1 10:40:58 2021 +0200
Commit: Michael Stahl <[email protected]>
CommitDate: Wed Jun 30 17:52:46 2021 +0200
avoid windres preprocessor quoting-messups with current cygwin
apparently fresh installs of cygwin behave differently with the windres
command's quoting and treats --preprocessor='cpp foo bar' as a single file
"cpp foo bar" to run instead of running "cpp" with the arguments "foo"
and "bar".
(-D and -I options are passed to the preprocessor automatically, so no
need to prefix those with --preprocessor-arg)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965
Tested-by: Jenkins
Reviewed-by: Georgy Litvinov <[email protected]>
Reviewed-by: Christian Lohmaier <[email protected]>
(cherry picked from commit 07f1ec0af02a9ab6c1bf6e6478092ee50495afa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114971
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit 3589180bfa67bc2ef411a56c9e8bb161f6c59902)
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 8ecdf60e6f87..e190f44eda63 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(call gb_Executable_
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(call
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
--host=$(gb_ExternalProject_gpgmepp_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call
gb_Executable_get_target_for_build,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
MAKE=$(MAKE) \
&& $(MAKE) \
)
diff --git a/external/libassuan/ExternalProject_libassuan.mk
b/external/libassuan/ExternalProject_libassuan.mk
index 83d79a520988..381632cc3215 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_Executabl
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
--host=$(gb_ExternalProject_libassuan_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call
gb_Executable_get_target_for_build,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
MAKE=$(MAKE) \
&& $(MAKE) \
)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 1fcd63180e20..6b7b0ac8e6a2 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -28,7 +28,7 @@ $(call
gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
--disable-doc \
--disable-tests \
--host=$(gb_ExternalProject_libgpg-error_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call
gb_Executable_get_target_for_build,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
&& $(MAKE) \
)
else
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
