diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2017-12-01 09:34:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-13 06:02:54 +0000 |
| commit | d06d1081c0553fbfd304b69dd5f9c591194f522a (patch) | |
| tree | 059ca1caf6b1440eb8e6d6a14e35028552d0ddc4 /coin/provisioning | |
| parent | c98db75188affe995e1131d6cce503ec277d9b94 (diff) | |
Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.
Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit adcdf7b49f52e745009ff7e37e07c2d831ad82dc)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh) | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index ef65b881..439e2db5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -34,7 +34,7 @@ ############################################################################# sudo yum-config-manager --enable rhel-server-rhscl7-rpms -sudo yum -y install devtoolset-6 +sudo yum -y install devtoolset-4 -echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index 05b73729..b69295fc 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -33,5 +33,5 @@ ## ############################################################################# -source /opt/rh/devtoolset-6/enable +source /opt/rh/devtoolset-4/enable source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" |