lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Install Devtoolset-4 to Rhel 7.4

Browse Source 
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 adcdf7b49f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2017-12-01 09:34:56 +02:00
committed by Liang Qi
parent c98db75188
commit d06d1081c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh → coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh
View File

@@ -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

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
View File

@@ -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"