Skip to content

Commit

Permalink
Fixes activate and dectivate scripts of emscripten-wasm32 (#1519)
Browse files Browse the repository at this point in the history
* Fixes activate and dectivate scripts of emscripten-wasm32

* Increased build number

* Fixed cross-python recipes

* ..

* ..
  • Loading branch information
JohanMabille authored Jan 13, 2025
1 parent 8bf368f commit e1d0bcd
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
4 changes: 2 additions & 2 deletions recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package:
version: ${{ version }}

build:
number: 10
number: 11

requirements:

Expand All @@ -17,7 +17,7 @@ requirements:
- emscripten_emscripten-wasm32
- rsync
- sed
- python 3.11
- python ==3.11
- setuptools #<60.0
- pip

Expand Down
9 changes: 7 additions & 2 deletions recipes/recipes/emscripten_emscripten-wasm32/activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 10 additions & 1 deletion recipes/recipes/emscripten_emscripten-wasm32/deactivate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
unset EM_FORGE_SIDE_MODULE_CFLAGS
unset LDFLAGS
2 changes: 1 addition & 1 deletion recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ context:
version: 3.1.45

build:
number: 31
number: 32

outputs:
- package:
Expand Down

0 comments on commit e1d0bcd

Please sign in to comment.