external/libgpg-error/ExternalProject_libgpg-error.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6825c3bab0392a4cbdb149b9c3ae0e7a9d7d0200
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 1 10:40:58 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jun 30 17:35:19 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 <g...@litvinovg.pro>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 07f1ec0af02a9ab6c1bf6e6478092ee50495afa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114971
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 3589180bfa67bc2ef411a56c9e8bb161f6c59902)
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 1fcd63180e20..ed9b6f716525 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
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
