]> granicus.if.org Git - pdns/commitdiff
Use devtoolset-3 on CentOS 6
authorPieter Lexis <pieter.lexis@powerdns.com>
Tue, 15 Mar 2016 13:00:42 +0000 (14:00 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Tue, 15 Mar 2016 13:00:42 +0000 (14:00 +0100)
build-scripts/build-auth-rpm
build-scripts/build-dnsdist-rpm
build-scripts/build-recursor-rpm

index 5b0a51903f8f98ece5d3710689f0548e7d0ce9f4..a1212a457f5179a26f4bc5a9de938e9024017f0c 100755 (executable)
@@ -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}
 
index 6e6043e4c2977773519efef7664f76a4118afbe9..15a59766c84606dcd174eb80f8ab93c2a9222757 100755 (executable)
@@ -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*)
       ;;
index 20e18aee131a231a6b9246557f80fb2e0f966420..d4ce269aaaad0559d6a25eebedf10d2a898c0b5f 100755 (executable)
@@ -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
 #