Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes activate and dectivate scripts of emscripten-wasm32 #1519

Merged
merged 5 commits into from
Jan 13, 2025
Merged

Fixes activate and dectivate scripts of emscripten-wasm32 #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afa975a
Fixes activate and dectivate scripts of emscripten-wasm32
JohanMabille Jan 10, 2025
10f7530
Increased build number
JohanMabille Jan 10, 2025
c12fefb
Fixed cross-python recipes
JohanMabille Jan 10, 2025
a9f3faf
..
JohanMabille Jan 10, 2025
4a0b864
..
JohanMabille Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading