control: tags -1 patch

Hello, bumping c++11 to c++17 works to make the build succeed.
Please also see Ubuntu build with the patch
https://launchpad.net/ubuntu/+source/libvmod-re2/2.0.0-2ubuntu1


thanks for considering it.

Gianfranco

diff -Nru libvmod-re2-2.0.0/debian/changelog libvmod-re2-2.0.0/debian/changelog
--- libvmod-re2-2.0.0/debian/changelog  2022-10-23 16:36:29.000000000 +0200
+++ libvmod-re2-2.0.0/debian/changelog  2024-05-25 07:27:43.000000000 +0200
@@ -1,3 +1,10 @@
+libvmod-re2 (2.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build failure by using std=c++17 (Closes: #1070649)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Sat, 25 May 2024 
07:27:43 +0200
+
 libvmod-re2 (2.0.0-2) unstable; urgency=medium

   * Add debian/gbp.conf.
diff -Nru libvmod-re2-2.0.0/debian/patches/series 
libvmod-re2-2.0.0/debian/patches/series
--- libvmod-re2-2.0.0/debian/patches/series     2022-10-23 16:36:29.000000000 
+0200
+++ libvmod-re2-2.0.0/debian/patches/series     2024-05-25 07:26:24.000000000 
+0200
@@ -5,3 +5,4 @@
 0005-Fix-expected-test-output-for-missing-subroutine.patch
 0006-Increase-test-timeout.patch
 0007-Fix-typo-in-documentation.patch
+std-c++17.patch
diff -Nru libvmod-re2-2.0.0/debian/patches/std-c++17.patch 
libvmod-re2-2.0.0/debian/patches/std-c++17.patch
--- libvmod-re2-2.0.0/debian/patches/std-c++17.patch    1970-01-01 
01:00:00.000000000 +0100
+++ libvmod-re2-2.0.0/debian/patches/std-c++17.patch    2024-05-25 
07:27:43.000000000 +0200
@@ -0,0 +1,29 @@
+Description: New absl/re2 requires at least std=c++17
+/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than 
C++14 are not supported."
+
+Author: Gianfranco Costamagna <locutusofb...@debian.org>
+Bug-Debian: https://bugs.debian.org/1070649
+Last-Update: 2024-05-25
+
+--- libvmod-re2-2.0.0.orig/configure.ac
++++ libvmod-re2-2.0.0/configure.ac
+@@ -98,7 +98,7 @@ AC_CHECK_HEADER_STDBOOL
+ AC_LANG(C++)
+ SAVE_CXXFLAGS="$CXXFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+-CXXFLAGS+=" -std=c++11"
++CXXFLAGS+=" -std=c++17"
+ LDFLAGS+=" -lre2"
+ # Check if the Set::Match() method supports error reporting, to notify
+ # if a match failed due to the DFA hitting the max_mem
+--- libvmod-re2-2.0.0.orig/src/Makefile.am     2024-05-25 07:25:25.000000000 
+0200
++++ libvmod-re2-2.0.0/src/Makefile.am  2024-05-25 07:29:41.798272339 +0200
+@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
+
+ AM_CFLAGS = $(VARNISHAPI_CFLAGS) -Wall -Werror -Wextra -std=c99
+ AM_LDFLAGS = $(VARNISHAPI_LIBS) $(VMOD_LDFLAGS)
+-AM_CXXFLAGS = -Wall -Werror -Wextra -std=c++11 @RE2_CFLAGS@
++AM_CXXFLAGS = -Wall -Werror -Wextra -std=c++17 @RE2_CFLAGS@
+
+ vmod_LTLIBRARIES = libvmod_re2.la
+


On Mon, 6 May 2024 11:26:43 -0400 Stefano Rivera <stefa...@debian.org> wrote:
Source: libvmod-re2
Version: 2.0.0-2
Severity: important
Tags: ftbfs
Control: affects -1 src:re2

libvmod-re2 fails to build with re2 from experimental:

libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -Wdate-time -D_FORTIFY_SOURCE=2 
-I/usr/include/varnish -Wall -Werror -Wextra -std=c99 -g -O2 
-Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. 
-fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security 
-fcf-protection -pthread -fstack-protector -c vmod_re2.c  -fPIC -DPIC -o .libs/vmod_re2.o
In file included from /usr/include/absl/base/config.h:86,
                 from /usr/include/absl/base/internal/invoke.h:40,
                 from /usr/include/absl/base/call_once.h:34,
                 from /usr/include/re2/re2.h:222,
                 from vre2/vre2set.h:43,
                 from vre2/vre2set.cpp:34:
/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than 
C++14 are not supported."

Full build log: 
https://debusine.debian.net/artifact/66531/libvmod-re2_2.0.0-2_amd64-2024-05-06T15:18:37Z.build

It looks like it needs to set a higher C++ std version.

Stefano


Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to