connectivity/source/parse/sqlbison.y                  |    6 ++++++
 external/gpgmepp/ExternalProject_gpgmepp.mk           |    2 +-
 external/libassuan/ExternalProject_libassuan.mk       |    3 ++-
 external/libgpg-error/ExternalProject_libgpg-error.mk |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 087692ac83ebdcd96d01fb370bd4f3227e97f394
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit:     Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Mon Aug 15 11:19:41 2022 +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)

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index dbf203f814a1..3aad860d2655 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -73,9 +73,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 c429c66a7d1387b93cb20a5263b00bd935d920d0
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Dec 28 17:22:29 2021 +0100
Commit:     Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Mon Aug 15 09:49:39 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>
    (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132061
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134517

diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index 899c21e4cec9..9237c35a5d31 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 a56864ffd1e85df9688a90289f49b0e8a676e12b
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Jun 15 18:03:27 2021 +0200
Commit:     Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Mon Aug 15 10:25:43 2022 +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)
    
    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 83d79a520988..899c21e4cec9 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,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

Reply via email to