From afa975a877a5cca9ad2d9e5b3fec10a877e49694 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 10 Jan 2025 12:02:33 +0100 Subject: [PATCH 1/5] Fixes activate and dectivate scripts of emscripten-wasm32 --- .../recipes/emscripten_emscripten-wasm32/activate.sh | 9 +++++++-- .../emscripten_emscripten-wasm32/deactivate.sh | 11 ++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/activate.sh b/recipes/recipes/emscripten_emscripten-wasm32/activate.sh index ad0a7ed9f..a371ee6b5 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/activate.sh +++ b/recipes/recipes/emscripten_emscripten-wasm32/activate.sh @@ -2,8 +2,13 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then export CONDA_FORGE_EMSCRIPTEN_ACTIVATED=1 - export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python3 - export PYTHON=${BUILD_PREFIX}/bin/python3 + if [ -z ${BUILD_PREFIX+x} ]; then + export EMSDK_PYTHON=${CONDA_PREFIX}/bin/python3 + export PYTHON=${CONDA_PREFIX}/bin/python3 + else + export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python3 + export PYTHON=${BUILD_PREFIX}/bin/python3 + fi CONDA_EMSDK_DIR=$CONDA_PREFIX/opt/emsdk diff --git a/recipes/recipes/emscripten_emscripten-wasm32/deactivate.sh b/recipes/recipes/emscripten_emscripten-wasm32/deactivate.sh index ab9bf172f..2736ab1bd 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/deactivate.sh +++ b/recipes/recipes/emscripten_emscripten-wasm32/deactivate.sh @@ -3,10 +3,19 @@ unset cmake unset CONDA_FORGE_EMSCRIPTEN_ACTIVATED +unset EMSDK_PYTHON +unset PYTHON +unset CONDA_EMSDK_DIR +unset CC +unset CXX +unset AR +unset RANLIB +unset CMAKE_ARGS unset PY_SIDE_LD_FLAGV unset EM_FORGE_OPTFLAGS unset EM_FORGE_DBGFLAGS unset EM_FORGE_LDFLAGS_BASE unset EM_FORGE_CFLAGS_BASE unset EM_FORGE_SIDE_MODULE_LDFLAGS -unset EM_FORGE_SIDE_MODULE_CFLAGS \ No newline at end of file +unset EM_FORGE_SIDE_MODULE_CFLAGS +unset LDFLAGS From 10f75302c467113435b4a85c767a904afd7ed21d Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 10 Jan 2025 13:24:44 +0100 Subject: [PATCH 2/5] Increased build number --- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index 228bd6e14..2cf9969da 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -3,7 +3,7 @@ context: version: 3.1.45 build: - number: 31 + number: 32 outputs: - package: From c12fefb686de5fd4912c72cb3b51599b5ffceb54 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 10 Jan 2025 13:46:24 +0100 Subject: [PATCH 3/5] Fixed cross-python recipes --- recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml index 3320f7ea1..2132a7a1d 100644 --- a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml @@ -17,7 +17,7 @@ requirements: - emscripten_emscripten-wasm32 - rsync - sed - - python 3.11 + - python >=3.11 - setuptools #<60.0 - pip From a9f3fafa3b8b2e17687aaa54862e05a1713941c1 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 10 Jan 2025 13:48:00 +0100 Subject: [PATCH 4/5] .. --- recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml index 2132a7a1d..d92d37bbb 100644 --- a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml @@ -7,7 +7,7 @@ package: version: ${{ version }} build: - number: 10 + number: 11 requirements: From 4a0b864bcc72cac2ef68dc21d5fca3fd6258eed7 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 10 Jan 2025 13:49:18 +0100 Subject: [PATCH 5/5] .. --- recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml index d92d37bbb..59bee3fca 100644 --- a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml @@ -17,7 +17,7 @@ requirements: - emscripten_emscripten-wasm32 - rsync - sed - - python >=3.11 + - python ==3.11 - setuptools #<60.0 - pip