configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69dd4ce13a34b046b4fe649548e5bb119b5cef6b
Author: Sam James <[email protected]>
AuthorDate: Fri Jan 13 15:09:59 2023 +0000
Commit: Stephan Bergmann <[email protected]>
CommitDate: Tue Jan 31 08:09:12 2023 +0000
configure.ac: Fix build with --with-system-zxing and < Clang 16
Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16
onwards).
This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
The new version of libzxing requires C++ 17, per its release notes. Adapt
the configure check accordingly to pass -std=c++17 when checking for its
headers and save accordingly if successful.
(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
for our compiler, despite its name.)
Bug: https://bugs.gentoo.org/890324
Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
Signed-off-by: Sam James <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145479
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146372
diff --git a/configure.ac b/configure.ac
index e626c925f49b..e40051e2c616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11178,7 +11178,7 @@ else
continue
fi
dnl TODO: White space in $i would cause problems:
- CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
+ CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing;
break],
[unset ac_cv_header_MultiFormatWriter_h], [#include
<stdexcept>])
done
