diff options
| author | Martchus | 2025-04-03 22:29:47 +0200 |
|---|---|---|
| committer | Martchus | 2025-04-03 22:29:47 +0200 |
| commit | f0b525e25dccc109c1e2a2bd557746ddb04803be (patch) | |
| tree | 653e76f7247d77e1d59c8422387a9eb7ffe2e571 /0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch | |
| parent | 9e099469235eff502f8a2c86c586905f7f5fe487 (diff) | |
| download | aur-f0b525e25dccc109c1e2a2bd557746ddb04803be.tar.gz | |
Update to 6.9.0
Diffstat (limited to '0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch')
| -rw-r--r-- | 0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch b/0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch new file mode 100644 index 000000000000..3018570fe3bc --- /dev/null +++ b/0017-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch @@ -0,0 +1,34 @@ +From 6e0c9f18297bd1847cb3cb2af3c348779e37b070 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 9 Jun 2024 23:31:12 +0200 +Subject: [PATCH 17/19] Fix configuration when `EMSCRIPTEN_ROOT` is an absolute + path + +Not sure whether this is unusual but under Arch Linux the `emscripten` +package specifies absoute paths in `/usr/lib/emscripten/.emscripten`. In +this case it makes no sense to treat them as relative to `EMSDK` (which +would lead to configuration errors). + +Change-Id: I506de85f3bc0ab2f865d5fd3c7e6767d51e9396e +--- + cmake/QtPublicWasmToolchainHelpers.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake +index ecdca052113..6e235c7556c 100644 +--- a/cmake/QtPublicWasmToolchainHelpers.cmake ++++ b/cmake/QtPublicWasmToolchainHelpers.cmake +@@ -13,6 +13,10 @@ function(__qt_internal_get_emroot_path_suffix_from_emsdk_env out_var) + string(REGEX MATCH "EMSCRIPTEN_ROOT.*$" EMROOT "${ver}") + string(REGEX MATCH "'([^' ]*)'" EMROOT2 "${EMROOT}") + string(REPLACE "'" "" EMROOT_PATH "${EMROOT2}") ++ if (IS_ABSOLUTE ${EMROOT_PATH}) ++ set($ENV{EMSDK} "${EMROOT_PATH}") ++ set(EMROOT_PATH "") ++ endif () + + set(${out_var} "${EMROOT_PATH}" PARENT_SCOPE) + endfunction() +-- +2.49.0 + |