diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/default.txt | 1 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/gcc.sh | 5 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5417e7ee..2032cf9a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,6 +10,7 @@ qtci-windows-10-x86_64-10 MSVC2017 qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 44ff654b..44c63e2f 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -37,6 +37,8 @@ # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -ex @@ -97,6 +99,9 @@ function InstallGCC() { sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" fi + echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf + echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf + sudo ldconfig -v echo "GCC = $version" >> ~/versions.txt } diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index dae1a58e..d6c04d5b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -108,7 +108,7 @@ installPackages+=(g++-multilib) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) -installPackages+=(python3-virtualenv) +installPackages+=(virtualenv) installPackages+=(python3-wheel) # python2 development package installPackages+=(python-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 62940e21..947583da 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,5 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400 - +InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2 |