From 812ed5ef04294467b4833b0e19f0ea4b418db55a Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Mon, 23 Jan 2023 15:31:20 +0100 Subject: [PATCH 1/2] Substitute GB_CXXFLAGS_STD_CPP17 [CONFIGURATION] * BUG: Substitute GB_CXXFLAGS_STD_CPP17 --- acinclude.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/acinclude.m4 b/acinclude.m4 index edb5080cb..7b5fe0500 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -458,6 +458,7 @@ AC_DEFUN([GB_INIT], AC_SUBST(AM_CXXFLAGS_OPT) AC_SUBST(GB_CFLAGS_LTO) AC_SUBST(GB_CXXFLAGS_STD_CPP11) + AC_SUBST(GB_CXXFLAGS_STD_CPP17) rm -f DISABLED DISABLED.* FAILED ]) From 2278fbd8c7c62fa6f65ba7a783b7424c1e048028 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Mon, 23 Jan 2023 15:38:53 +0100 Subject: [PATCH 2/2] Revert "Disable 'gb.poppler' on 'archlinux-clang', as clang seems to be unable to compile it." This reverts commit 0d3b39eed3152549799542d63bf88c96b36b92e8. clang was just missing the -std=c++17 which is the default for g++ for some time. clang++ still defaults to -std=c++14. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aca7f33c..38c9523f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ build:archlinux-clang: zlib gettext qt5-webengine webkit2gtk script: - ./reconf-all - - GAMBAS_CONFIG_FAILURE=1 ./configure CC=clang CXX=clang++ -C --disable-sqlite2 --disable-qt4 --disable-pdf --disable-poppler --disable-qt5webkit + - GAMBAS_CONFIG_FAILURE=1 ./configure CC=clang CXX=clang++ -C --disable-sqlite2 --disable-qt4 --disable-pdf --disable-qt5webkit - make -j$(nproc) - make install