From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 19 Oct 2022 14:11:53 +0000 (+0200)
Subject: el7: bump devtoolset to 11
X-Git-Tag: dnsdist-1.8.0-rc1~267^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12101%2Fhead;p=thirdparty%2Fpdns.git

el7: bump devtoolset to 11
---

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 806c5c8222..b21923a435 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -23,7 +23,7 @@ RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/r
 
 @IF [ -n "$M_authoritative$M_all" ]
 RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \
-      scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
+      scl enable devtoolset-11 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     fi
@@ -31,7 +31,7 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then
 
 @IF [ -n "$M_recursor$M_all" ]
 RUN touch /var/lib/rpm/* &&  if $(grep -q 'release 7' /etc/redhat-release); then \
-      scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
+      scl enable devtoolset-11 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     fi
@@ -48,7 +48,7 @@ RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
       make install
 
 RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \
-      scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+      scl enable devtoolset-11 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     fi
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7
index 9deb58b99c..9bd7c2a124 100644
--- a/builder-support/dockerfiles/Dockerfile.target.centos-7
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-7
@@ -12,7 +12,7 @@ FROM amd64/centos:7 as dist-base
 
 ARG BUILDER_CACHE_BUSTER=
 RUN touch /var/lib/rpm/* && yum install -y epel-release centos-release-scl-rh
-RUN touch /var/lib/rpm/* && yum install -y --nogpgcheck devtoolset-8-gcc-c++
+RUN touch /var/lib/rpm/* && yum install -y --nogpgcheck devtoolset-11-gcc-c++
 
 # Do the actual rpm build
 @INCLUDE Dockerfile.rpmbuild