config_host.mk.in | 1 -
configure.ac | 1 -
connectivity/source/parse/sqlbison.y | 6 ++++++
external/postgresql/ExternalProject_postgresql.mk | 1 +
solenv/gbuild/platform/com_MSC_class.mk | 4 ----
solenv/gbuild/platform/com_MSC_defs.mk | 17 +----------------
6 files changed, 8 insertions(+), 22 deletions(-)
New commits:
commit e573dd2123bff0e1caeb66026886d76340f76e6c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Dec 18 17:30:01 2021 +0100
Adapt to Bison 3.8 internal yyn -> yyrule rename
see
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
"glr2.cc: log the execution of deferred actions" including "Rename argument
yyn
as yyrule for clarity."
YYBISON was defined as 1 rather than as a representation of the Bison
version
prior to
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
"yacc.c: provide the Bison version as an integral macro", which shouldn't
be a
problem here. And YYBISON is apparently completely undefined with
/usr/bin/bison on macOS.
(The preceding comment always mentioned "yyi" and "yyrmap" in apparent
mismatch
with the actually used "yyn" and "yyr1" ever since
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
untouched.)
Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123408
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 2c55bae0f66b..77f0c6b68a3e 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -71,9 +71,15 @@ inline connectivity::OSQLInternalNode* newNode(const
OUString& _newValue,
// yyi is the internal number of the rule that is currently being reduced
// This can be mapped to external rule number via the yyrmap.
+#if defined YYBISON && YYBISON >= 30800
+#define SQL_NEW_RULE newNode("", SQLNodeType::Rule,
yyr1[yyrule])
+#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule,
yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule,
yyr1[yyrule])
+#else
#define SQL_NEW_RULE newNode("", SQLNodeType::Rule,
yyr1[yyn])
#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule,
yyr1[yyn])
#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule,
yyr1[yyn])
+#endif
extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
commit 2882d0c7dc3403bd9bec24cd7d1dc267565bf0bf
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Aug 3 18:32:16 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Dec 18 16:54:42 2021 +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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit da36d655608c3da39fd79d95974e1f7404a27aa0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119977
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
diff --git a/config_host.mk.in b/config_host.mk.in
index c74a097b937b..b98820dff0c1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -207,7 +207,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 a7c0bc3cece3..2f60977ebdd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4923,7 +4923,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 860f35200661..fde4c75c5505 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -382,11 +382,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 068cfd6bf946..61e68f5ecd58 100755
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -304,19 +304,6 @@ 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
@@ -325,9 +312,7 @@ endef
# $(1): one directory pathname to append to the ld path
define gb_Helper_extend_ld_path
-$(gb_Helper_set_ld_path):$(shell cygpath -u $(1))
+$(gb_Helper_set_ld_path)':$(shell cygpath -u $(1))'
endef
-endif
-
# vim: set noet sw=4:
commit 84d52dd4e9ca4118698682ba60025c6026a533fc
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Sat Dec 18 16:53:07 2021 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Dec 18 16:53:07 2021 +0100
Unset MAKEFLAGS to avoid confusing Win native nmake
Otherwise errors-out over dash params, leading to perl errorneously
thinking it didn't find nmake.
Change-Id: I33d6601fefd26eff20b684efe74a65555dccb37e
diff --git a/external/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
index 88cabdeb7a55..97402f335d18 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -22,6 +22,7 @@ ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
+ unset MAKEFLAGS && \
MSBFLAGS=/p:Platform=$(if $(filter
X86_64,$(CPUNAME)),x64,Win32) \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
libpq \
,src/tools/msvc)
