diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-09 23:09:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-09 23:09:15 +0100 |
| commit | c2c45640e0bc40fb9ac3a8175325a76de2c0b496 (patch) | |
| tree | 0151a5637dcb7330ece51c3c744f216e117a875d /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64 | |
| parent | a0e1f4f480149c4a3cac0294c6c7cab2ad0ab76e (diff) | |
| parent | 828f82b6f00946c194b6909559bdce0b40d0f9a8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/qt5.txt
coin/provisioning/common/install-commandlinetools.sh
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d7abd285..d10bc06d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1 +1,2 @@ +#!/usr/bin/env bash $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 4933269a..15b46aef 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -42,12 +42,12 @@ set -e mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc.lic" +iccLicense="l_icc_2018.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -79,7 +79,7 @@ EOT # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.0 20170811" >> ~/versions.txt +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt rm -rf "$iccTmpPath" |