From 9b84aa282ff8eff2feb8cbe10b9d8d26ec504e42 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 15 Mar 2016 14:00:42 +0100 Subject: [PATCH] Use devtoolset-3 on CentOS 6 --- build-scripts/build-auth-rpm | 2 +- build-scripts/build-dnsdist-rpm | 2 +- build-scripts/build-recursor-rpm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm index 5b0a51903..a1212a457 100755 --- a/build-scripts/build-auth-rpm +++ b/build-scripts/build-auth-rpm @@ -51,7 +51,7 @@ case "$OS" in # Fedora\ *\ 21*) # ;; CentOS\ *\ 6*) - RPMBUILD_COMMAND="scl enable devtoolset-2 -- ${RPMBUILD_COMMAND}" + RPMBUILD_COMMAND="scl enable devtoolset-3 -- ${RPMBUILD_COMMAND}" cat > pdns.spec << EOF %global backends %{nil} diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm index 6e6043e4c..15a59766c 100755 --- a/build-scripts/build-dnsdist-rpm +++ b/build-scripts/build-dnsdist-rpm @@ -65,7 +65,7 @@ if [ -f /etc/redhat-release ]; then INIT_INSTALL='install -d -m 755 %{buildroot}/%{_initrddir} && install -m 755 contrib/dnsdist.init.centos6 %{buildroot}/%{_initrddir}/dnsdist' INIT_FILES='%{_initrddir}/dnsdist' SETUP="%setup -n %{name}-${TARBALLVERSION}" - RPMBUILD_COMMAND="scl enable devtoolset-2 -- ${RPMBUILD_COMMAND}" + RPMBUILD_COMMAND="scl enable devtoolset-3 -- ${RPMBUILD_COMMAND}" ;; CentOS\ Linux\ *\ 7*) ;; diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm index 20e18aee1..d4ce269aa 100755 --- a/build-scripts/build-recursor-rpm +++ b/build-scripts/build-recursor-rpm @@ -43,7 +43,7 @@ if [ -f /etc/redhat-release ]; then exit 1 ;; CentOS\ *\ 6*) - RPMBUILD_COMMAND="scl enable devtoolset-2 -- ${RPMBUILD_COMMAND}" + RPMBUILD_COMMAND="scl enable devtoolset-3 -- ${RPMBUILD_COMMAND}" cat > $HOME/rpmbuild/SOURCES/pdns-recursor.init << EOF #!/bin/bash # -- 2.40.0