summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2021-12-28 17:22:29 +0100
committerGabor Kelemen <kelemeng@ubuntu.com>2022-08-15 09:49:39 +0100
commitc429c66a7d1387b93cb20a5263b00bd935d920d0 (patch)
tree2364c24596ebf8ccf06543f4c739ddf96192a2d9
parentavoid windres preprocessor quoting-messups with current cygwin (diff)
downloadcore-c429c66a7d1387b93cb20a5263b00bd935d920d0.tar.gz
core-c429c66a7d1387b93cb20a5263b00bd935d920d0.zip
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.behrens@allotropia.de> (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132061 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134517
-rw-r--r--external/libassuan/ExternalProject_libassuan.mk1
1 files changed, 1 insertions, 0 deletions
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)" \