From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 6 Feb 2025 16:47:39 +0000 (+0100)
Subject: dnsdist: Ignore `re2`'s broken compilation flags
X-Git-Tag: dnsdist-2.0.0-alpha1~119^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=769bc6d4d9f18bb6db854b692ad98d4dd7cca4d7;p=thirdparty%2Fpdns.git

dnsdist: Ignore `re2`'s broken compilation flags

Apparently some version(s) of `re2` pass `-std=c++11` in the result
of `pkg-config --cflags`, which helpfully downgrades us from C++17
to C++11. Let's just ignore what it says.
---

diff --git a/pdns/dnsdistdist/meson/re2/meson.build b/pdns/dnsdistdist/meson/re2/meson.build
index f85c297fb5..8ef952dce2 100644
--- a/pdns/dnsdistdist/meson/re2/meson.build
+++ b/pdns/dnsdistdist/meson/re2/meson.build
@@ -1,5 +1,12 @@
 opt_libre2 = get_option('re2')
 dep_libre2 = dependency('re2', required: opt_libre2)
 
+if dep_libre2.found()
+    # we need to NOT pick the CFLAGS because re2 "helpfully" puts -std=c++11 here
+    dep_libre2 = dep_libre2.partial_dependency(
+        link_args: true
+    )
+endif
+
 conf.set('HAVE_RE2', dep_libre2.found(), description: 're2')
 summary('Re2', dep_libre2.found(), bool_yn: true, section: 're2')