install-deps.sh: use DTS on centos if GCC is too old

please note, run-make-check.sh sources install-deps.sh here to import
the $PATH and other environmental variables, which could be changed by
the the DTS "enable" script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3f8647a7e80b20079bec97d5be12372909083bb4)

Conflicts:
	install-deps.sh
	run-make-check.sh
- RH/CentOS changes only

diff --git a/install-deps.sh b/install-deps.sh
index 016abf5b7ad24c797e82a4b484a069eb5bbaae48..645d3f2c40d12a808bbc23b8539f79c23fcbba75 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -62,6 +62,38 @@ EOF
     $SUDO ln -nsf /usr/bin/g++ /usr/bin/x86_64-linux-gnu-g++
 }
 
+function version_lt {
+    test $1 != $(echo -e "$1\n$2" | sort -rV | head -n 1)
+}
+
+function ensure_decent_gcc_on_rh {
+    local old=$(gcc -dumpversion)
+    local expected=5.1
+    local dts_ver=$1
+    if version_lt $old $expected; then
+       case $- in
+           *i*)
+               # interactive shell
+               cat <<EOF
+Your GCC is too old. Please run following command to add DTS to your environment:
+
+scl enable devtoolset-7 bash
+
+Or add following line to the end of ~/.bashrc to add it permanently:
+
+source scl_source enable devtoolset-7
+
+see https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/ for more details.
+EOF
+           ;;
+           *)
+               # non-interactive shell
+               source /opt/rh/devtoolset-$dts_ver/enable
+               ;;
+       esac
+    fi
+}
+
 if [ x`uname`x = xFreeBSDx ]; then
     $SUDO pkg install -yq \
         devel/babeltrace \
@@ -179,12 +211,17 @@ else
                     $SUDO yum-config-manager --enable cr
                    case $(uname -m) in
                        x86_64)
-                           $SUDO yum install centos-release-scl;;
+                           $SUDO yum install centos-release-scl
+                           dts_ver=7
+                           ;;
                        aarch64)
-                           $SUDO yum install centos-release-scl-rh;;
+                           $SUDO yum install centos-release-scl-rh
+                           dts_ver=6
+                           ;;
                    esac
                 elif test $(lsb_release -si) = RedHatEnterpriseServer -a $MAJOR_VERSION = 7 ; then
                     $SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
+                    dts_ver=7
                 elif test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then
                     $SUDO yum-config-manager --enable cr
                 fi
@@ -193,6 +230,9 @@ else
         munge_ceph_spec_in $DIR/ceph.spec
         $SUDO $yumdnf install -y \*rpm-macros
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
+       if [ -n dts_ver ]; then
+            ensure_decent_gcc_on_rh $dts_ver
+       fi
         ! grep -q -i error: $DIR/yum-builddep.out || exit 1
         ;;
     opensuse*|suse|sles)

diff --git a/run-make-check.sh b/run-make-check.sh
index 2244e5ea5b0aac5b8c0c0e253e5e83182d0b5297..b5679e4e14f6bbf024a05e6f92604ab0662b6968 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -89,7 +89,7 @@ function run() {
     fi
 
     if test -f ./install-deps.sh ; then
-       $DRY_RUN ./install-deps.sh || return 1
+       $DRY_RUN source ./install-deps.sh || return 1
         trap clean_up_after_myself EXIT
     fi