From 10faee473f1da73c75ecd96ff45be4e28c77aaa6 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 9 May 2025 22:25:25 +0300 Subject: [PATCH] wasm: set EMSDK_PYTHON to Python installed in provisioning Emscripten 4.0.7 requires Python +3.8, OpenSUSE does have Python 3.11 but its path is only set to PYTHON3_EXECUTABLE envvar defined in 08-pythondev.sh. OpenSUSE 15.6 comes with Python 3.6.15 which the previous emscripten 3.1.70 used. Change-Id: Ied63ace32b7fb252d124ad447bc56dba353ff403 Reviewed-by: Lorn Potter (cherry picked from commit 7471b6b6d294da7732a7796d0717cf61e39d069e) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/emsdk.sh | 1 + .../qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 4da763a8..6c2a0a5e 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -53,5 +53,6 @@ SetEnvVar "PATH" "\"\$PATH:${emscriptenPath}\"" SetEnvVar "EMSCRIPTEN" "${emscriptenPath}" SetEnvVar "EMSDK" "${emsdkPath}" SetEnvVar "EMSDK_NODE" "${emsdkPath}${pathNodeExecutable}" +SetEnvVar "EMSDK_PYTHON" "$PYTHON3_EXECUTABLE" echo "Emsdk = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh index 54776fdd..642aa688 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh @@ -3,7 +3,7 @@ # provides: python development libraries # version: provided by default Linux distribution repository -# needed to build pyside +# needed to build pyside and emsdk for WebAssembly set -ex