config_host.mk.in | 1 -
configure.ac | 1 -
external/gpgmepp/ExternalProject_gpgmepp.mk | 2 +-
external/libassuan/ExternalProject_libassuan.mk | 3 ++-
external/libgpg-error/ExternalProject_libgpg-error.mk | 2 +-
solenv/gbuild/platform/com_MSC_class.mk | 4 ----
solenv/gbuild/platform/com_MSC_defs.mk | 16 ----------------
7 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit c5891e585112b20a5132da25342a6bda119254e8
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Jun 15 18:03:27 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Jan 27 22:39:53 2022 +0100
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)
Conflicts:
- solenv/gbuild/platform/com_MSC_defs.mk
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
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 9b120ad2773676c5445d4664e9c7007c575249a4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097
Tested-by: Vasily Melenchuk <vasily.melenc...@cib.de>
Reviewed-by: Vasily Melenchuk <vasily.melenc...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit 9fafa67c9bc85d9e5a13d18b7b7ecbc8de700c04)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127058
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 452f922750d6..dac2fad1361b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(call gb_Executable_
$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
$(if $(filter
$(true),$(gb_SYMBOL)),$(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,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 f137452ed35a..9237c35a5d31 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -35,7 +35,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,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..e5155aad94c1 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,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
&& $(MAKE) \
)
else
commit 65413a0a3dbdff3ea1147916ecb58c757f498bab
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Dec 28 17:22:29 2021 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Jan 27 21:57:20 2022 +0100
Fix autoconf>=2.70 gcc-wrapper breakage
Re-generated configure file gets confused & claims not finding C89-
compatible compiler for gcc-wrapper-building libassuan with msvc
underneath.
Work-around the problem by telling toolchain right off that this
_is_ a std c compliant compiler.
Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/external/libassuan/ExternalProject_libassuan.mk
b/external/libassuan/ExternalProject_libassuan.mk
index 83d79a520988..f137452ed35a 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_Executabl
--disable-shared \
--disable-doc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+ CFLAGS="$(CFLAGS) -D__STDC__=1" \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
commit 1a415e6408f2fb3409235a7ec1f2398a6750fcfc
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Sat Aug 7 13:55:21 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Jan 27 19:09:39 2022 +0100
Always provision PATH the cygwin way under Windows
With PATH essentially serving the role of LD_LIBRARY_PATH under
Windows, there was the notion that this needs to be provided in
Windows notation, for win32 gnumake.
That was perhaps once true; currently we're always evaluating PATH
inside a shell, not the Makefile. So this since a while only worked
accidentally, due to cygwin transparently converting between DOS and
UNIX PATH vars. It did break though for corner-cases, e.g.
SRCDIR!=BUILDDIR, and BUILDDIR e.g. D:\FOO.
With that simplification, also GNUMAKE_WIN_NATIVE can go.
Conflicts:
- solenv/gbuild/platform/com_MSC_defs.mk
Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
(cherry picked from commit c4bbcc4dfc7e7402d6689ca11ac9dca2f78008fb)
diff --git a/config_host.mk.in b/config_host.mk.in
index 9ed3802ad761..6bf5258e948e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -217,7 +217,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
export PARALLELISM?=@PARALLELISM@
@x_GNUCP@ export GNUCOPY=@GNUCP@
-export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
export GNUPATCH=@GNUPATCH@
export GNUTAR=@GNUTAR@
export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 5c7331e13f08..10896ca8de9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4973,7 +4973,6 @@ else
fi
rm -rf $TESTGMAKEFILEFUNC
AC_SUBST(HAVE_GNUMAKE_FILE_FUNC)
-AC_SUBST(GNUMAKE_WIN_NATIVE)
_make_ver_check=`$GNUMAKE --version | grep "Built for Windows"`
STALE_MAKE=
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 1fefa80fef61..a86e2a37ccf0 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -378,11 +378,7 @@ endef
gb_CppunitTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-WNT.sh
gb_CppunitTest_PYTHONDEPS := $(call gb_Package_get_target,python3)
gb_CppunitTest_DEFS := -D_DLL
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell
cygpath -w $(gb_Library_DLLDIR));$(shell cygpath -w
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-else
gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell
cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-endif
gb_CppunitTest_get_filename = test_$(1).dll
gb_CppunitTest_get_ilibfilename = itest_$(1).lib
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index e6afe0b5ad2a..09a4ef6a2080 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -336,20 +336,6 @@ gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS :=
endif
# Helper class
-
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_Helper_set_ld_path := PATH="$(shell cygpath -w
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w
$(INSTDIR)/$(LIBO_BIN_FOLDER));$$PATH"
-
-define gb_Helper_prepend_ld_path
-PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w
$(INSTDIR)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
-endef
-
-# $(1): one directory pathname to append to the ld path
-define gb_Helper_extend_ld_path
-$(gb_Helper_set_ld_path)';$(shell cygpath -w $(1))'
-endef
-
-else
gb_Helper_set_ld_path := PATH="$(shell cygpath -u
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u
$(INSTDIR)/$(LIBO_BIN_FOLDER)):$$PATH"
define gb_Helper_prepend_ld_path
@@ -361,6 +347,4 @@ define gb_Helper_extend_ld_path
$(gb_Helper_set_ld_path):$(shell cygpath -u $(1))
endef
-endif
-
# vim: set noet sw=4:
