From 0c33f20cf49ca46a1347fdbb5eac5e8975f1f8ba Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Mon, 16 Dec 2024 16:54:58 +0100 Subject: [PATCH 1/3] gh-127146: Emscripten Include compiler version in _PYTHON_HOST_PLATFORM `test_sysconfigdata_json` is failing. This doesn't entirely fix it but it moves the failure later -- before it doesn't even find the sysconfigdata file because of a descrepancy between what `uname()` returns and what `configure.ac` sets `_PYTHON_HOST_PLATFORM` to. After, there are some small differences. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 57be576e3cae99..0ffcf55d267c8a 100755 --- a/configure +++ b/configure @@ -4545,6 +4545,9 @@ printf "%s\n" "$IPHONEOS_DEPLOYMENT_TARGET" >&6; } *-*-vxworks*) _host_ident=$host_cpu ;; + *-*-emscripten) + _host_ident=$(cat $(dirname $(which emcc))/emscripten-version.txt | cut -d- -f1)-$host_cpu + ;; wasm32-*-* | wasm64-*-*) _host_ident=$host_cpu ;; diff --git a/configure.ac b/configure.ac index bd0221481c5341..87b5239559420a 100644 --- a/configure.ac +++ b/configure.ac @@ -793,6 +793,9 @@ if test "$cross_compiling" = yes; then *-*-vxworks*) _host_ident=$host_cpu ;; + *-*-emscripten) + _host_ident=$(cat $(dirname $(which emcc))/emscripten-version.txt | cut -d- -f1)-$host_cpu + ;; wasm32-*-* | wasm64-*-*) _host_ident=$host_cpu ;; From 6c3bdd85791834a95bdb702be3db8c7d1b5db63d Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Mon, 16 Dec 2024 19:21:32 +0100 Subject: [PATCH 2/3] Update configure.ac Co-authored-by: Kleis Auke Wolthuizen --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 87b5239559420a..76ff093404cd96 100644 --- a/configure.ac +++ b/configure.ac @@ -794,7 +794,7 @@ if test "$cross_compiling" = yes; then _host_ident=$host_cpu ;; *-*-emscripten) - _host_ident=$(cat $(dirname $(which emcc))/emscripten-version.txt | cut -d- -f1)-$host_cpu + _host_ident=$(emcc -dumpversion)-$host_cpu ;; wasm32-*-* | wasm64-*-*) _host_ident=$host_cpu From 609da1a10d3978310f005ef242ea9e9da200bf97 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Tue, 17 Dec 2024 10:12:02 +0100 Subject: [PATCH 3/3] Address review comments and rerun autoconf --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0ffcf55d267c8a..6df1116fc600f2 100755 --- a/configure +++ b/configure @@ -4545,9 +4545,9 @@ printf "%s\n" "$IPHONEOS_DEPLOYMENT_TARGET" >&6; } *-*-vxworks*) _host_ident=$host_cpu ;; - *-*-emscripten) - _host_ident=$(cat $(dirname $(which emcc))/emscripten-version.txt | cut -d- -f1)-$host_cpu - ;; + *-*-emscripten) + _host_ident=$(emcc -dumpversion)-$host_cpu + ;; wasm32-*-* | wasm64-*-*) _host_ident=$host_cpu ;; diff --git a/configure.ac b/configure.ac index 76ff093404cd96..8295b59b8e45fb 100644 --- a/configure.ac +++ b/configure.ac @@ -793,9 +793,9 @@ if test "$cross_compiling" = yes; then *-*-vxworks*) _host_ident=$host_cpu ;; - *-*-emscripten) - _host_ident=$(emcc -dumpversion)-$host_cpu - ;; + *-*-emscripten) + _host_ident=$(emcc -dumpversion)-$host_cpu + ;; wasm32-*-* | wasm64-*-*) _host_ident=$host_cpu ;; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy