[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - config_host.mk.in configure.ac solenv/gbuild

[Thorsten Behrens (via logerrit)]

 config_host.mk.in                       |    1 -
 configure.ac                            |    1 -
 solenv/gbuild/platform/com_MSC_class.mk |    4 ----
 solenv/gbuild/platform/com_MSC_defs.mk  |   12 +++---------
 4 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 21ebaf567c80207625063ec7eb69d84d2f6c3c23
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Tue Aug 3 18:32:16 2021 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Mon Aug 9 13:23:59 2021 +0200

    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.
    
    Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    (cherry picked from commit da36d655608c3da39fd79d95974e1f7404a27aa0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119976
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
    (cherry picked from commit 71e7457cddda30a52cbf91d400e682bf11b67fa5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119981
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index f2117f306615..8bce24cb480d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -243,7 +243,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 10b685438d03..59761742e0fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6044,7 +6044,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 76dea12e1ec6..0d35b7915999 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -470,11 +470,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 1fa6d87bdd29..07720dc2e2f1 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -297,21 +297,15 @@ endif
 
 # Helper class
 
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_MAKE_CYGPATH := -w
-else
-gb_MAKE_CYGPATH := -u
-endif
-
-gb_Helper_set_ld_path := PATH="$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$$PATH"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$$PATH"
 
 define gb_Helper_prepend_ld_path
-PATH="$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
+PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(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 $(gb_MAKE_CYGPATH) $(1))'
+$(gb_Helper_set_ld_path)':$(shell cygpath -u $(1))'
 endef
 
 # common macros to build GPG related libraries