summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2021-12-28 17:22:29 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2022-01-07 14:02:59 +0100
commit30582ba78dc6682a55f193905461b4abbec3e35e (patch)
tree30632e7bcb53baa82c5b06a24e795b153d322157
parentofz#43376 Null-dereference (diff)
downloadcore-30582ba78dc6682a55f193905461b4abbec3e35e.tar.gz
core-30582ba78dc6682a55f193905461b4abbec3e35e.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/+/127579 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-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 8ee96826cd69..a4c2510ba2dc 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -31,6 +31,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)" \