aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-12-11 11:52:43 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-12-11 18:54:58 +0200
commit73472378162bf7d5e70de7a399c549504d472e89 (patch)
tree7574a41d5f6501ca9121f86944b662a81161a4b0
parent915cb775cec85a5d720646dc01fdd3ebaf34591a (diff)
Provisioning: Add Nodejs12 to Path for RedHat
Nodejs will not be installed under /opt/rh/devtoolset-4/ but instead under /opt/rh/rh-nodejs12 which means it needs to be added to PATH separately Change-Id: Ic7acbfaead866a89e03811ecdca2a7caf8476546 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
index 405d0492..5d838575 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
@@ -80,7 +80,7 @@ installPackages+=(pulseaudio-libs-devel)
installPackages+=(libXtst-devel)
installPackages+=(nspr-devel)
installPackages+=(nss-devel)
-installPackages+=(rh-nodejs12-nodejs)
+installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH!
installPackages+=(rh-nodejs12-nodejs-devel)
# For Android builds
installPackages+=(java-1.8.0-openjdk-devel)
@@ -146,6 +146,7 @@ sudo /usr/local/bin/pip3 install wheel
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin/node:\$PATH"
gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
echo "GCC = $gccVersion" >> versions.txt