commit f597d07ec9e6c97e4db60df9b99ec793c3407777
author Davide Pesavento <davidepesa@gmail.com> Mon Jul 04 21:20:21 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri Jul 08 17:52:51 2022 -0400
tree 058758bf61fceebbd1be50dca09a3426e7b56ab5
parent 40eae0328b79faf4182c0348b1286cb60fa5f2b4

build: support CentOS Stream 9, drop CentOS 8

Refs: #5181
Change-Id: I289930c9658137e1637357f81c762ebb331474c8

.jenkins.d/00-deps.sh

diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 25961a1..5a9c2f3 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -41,8 +41,7 @@
             ;;
     esac
 
-elif has CentOS-8 $NODE_LABELS; then
-    sudo dnf config-manager --enable powertools
+elif has CentOS $NODE_LABELS; then
     sudo dnf -y install gcc-c++ libasan pkgconf-pkg-config python3 \
                         boost-devel openssl-devel sqlite-devel \
                         libpcap-devel

.jenkins.d/01-ndn-cxx.sh

diff --git a/.jenkins.d/01-ndn-cxx.sh b/.jenkins.d/01-ndn-cxx.sh
index 4e0e154..5da6d35 100755
--- a/.jenkins.d/01-ndn-cxx.sh
+++ b/.jenkins.d/01-ndn-cxx.sh
@@ -35,19 +35,14 @@
 
 pushd ndn-cxx >/dev/null
 
-if has CentOS-8 $NODE_LABELS; then
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1721553
-    PCH="--without-pch"
-fi
-
-./waf --color=yes configure --disable-static --enable-shared --without-osx-keychain $PCH
+./waf --color=yes configure --disable-static --enable-shared --without-osx-keychain
 ./waf --color=yes build -j$WAF_JOBS
 sudo_preserve_env PATH -- ./waf --color=yes install
 
 popd >/dev/null
 popd >/dev/null
 
-if has CentOS-8 $NODE_LABELS; then
+if has CentOS $NODE_LABELS; then
     sudo tee /etc/ld.so.conf.d/ndn.conf >/dev/null <<< /usr/local/lib64
 fi
 if has Linux $NODE_LABELS; then