From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Fri, 8 Nov 2024 06:50:54 +0000 (+0200)
Subject: packaging: Use PCRE2 for .deb/.rpm builds
X-Git-Tag: base_10.3~230^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56ae4112cccfb83a8dbaa6c4aa5abc6c7a7763dc;p=matthieu%2Ffrr.git

packaging: Use PCRE2 for .deb/.rpm builds

We have the support of PCRE2 since 061f5d1cb43938c30847e0ebb49e2b43be3aa4c2.

Also we already do this for containers (docker images).

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/debian/rules b/debian/rules
index ec8f92f755..74573c9a0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ override_dh_auto_configure:
 		--enable-ospfapi \
 		--enable-bgp-vnc \
 		--enable-multipath=256 \
+		--enable-pcre2posix \
 		\
 		--enable-user=frr \
 		--enable-group=frr \
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index b65ebf966c..1ba8f043b2 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -189,6 +189,7 @@ BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  texinfo
 BuildRequires:  libyang-devel >= 2.1.128
+BuildRequires:  pcre2-devel
 %if 0%{?rhel} && 0%{?rhel} < 7
 #python27-devel is available from ius community repo for RedHat/CentOS 6
 BuildRequires:  python27-devel
@@ -448,7 +449,8 @@ Adds GRPC support to the individual FRR daemons.
 %else
     --disable-grpc \
 %endif
-    --enable-snmp
+    --enable-snmp \
+    --enable-pcre2posix \
     # end
 
 make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"