diff --git a/recipes/recipes_emscripten/netcdf4/build.sh b/recipes/recipes_emscripten/netcdf4/build.sh deleted file mode 100644 index f9fa6721e47..00000000000 --- a/recipes/recipes_emscripten/netcdf4/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# remove the emcc symlink in the $BUILD_PREFIX/bin -rm $BUILD_PREFIX/bin/emcc - -# make callable -chmod +x $RECIPE_DIR/emcc_wrapper.sh - -# create symlink to $RECIPE_DIR/emcc_wrapper.sh -ln -s $RECIPE_DIR/emcc_wrapper.sh $BUILD_PREFIX/bin/emcc - -${PYTHON} -m pip install . diff --git a/recipes/recipes_emscripten/netcdf4/emcc_wrapper.sh b/recipes/recipes_emscripten/netcdf4/emcc_wrapper.sh deleted file mode 100755 index 7d1f67a557b..00000000000 --- a/recipes/recipes_emscripten/netcdf4/emcc_wrapper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -$BUILD_PREFIX/bin/python3 $RECIPE_DIR/py_emcc_wrapper.py $BUILD_PREFIX/opt/emsdk/upstream/emscripten/emcc "$@" -exit $? \ No newline at end of file diff --git a/recipes/recipes_emscripten/netcdf4/patches/0001-Fix-unknown-arg-R-PREFIX-lib.patch b/recipes/recipes_emscripten/netcdf4/patches/0001-Fix-unknown-arg-R-PREFIX-lib.patch new file mode 100644 index 00000000000..b48f13a5015 --- /dev/null +++ b/recipes/recipes_emscripten/netcdf4/patches/0001-Fix-unknown-arg-R-PREFIX-lib.patch @@ -0,0 +1,24 @@ +From 13dd0b7fa704ed39dcc8c85ee3f7e86b3f1d72ae Mon Sep 17 00:00:00 2001 +From: Isabel Paredes +Date: Tue, 10 Feb 2026 17:41:03 +0100 +Subject: [PATCH] Fix unknown arg -R$PREFIX/lib + +wasm-ld: error: unknown argument: -R$PREFIX/lib + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8c02423..6d9ba67 100644 +--- a/setup.py ++++ b/setup.py +@@ -374,7 +374,7 @@ else: + if sys.platform == 'win32' or sys.platform == 'cygwin': + runtime_lib_dirs = [] + else: +- runtime_lib_dirs = lib_dirs ++ runtime_lib_dirs = [] + + # Do not require numpy for just querying the package + # Taken from the h5py setup file. diff --git a/recipes/recipes_emscripten/netcdf4/py_emcc_wrapper.py b/recipes/recipes_emscripten/netcdf4/py_emcc_wrapper.py deleted file mode 100644 index 2a84520fd1c..00000000000 --- a/recipes/recipes_emscripten/netcdf4/py_emcc_wrapper.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys -import subprocess -if __name__ == '__main__': - - args = sys.argv[2:] - - filtered_args = [] - for arg in args: - if ("-Wl,-R$PREFIX/lib" in arg )or ("-R" in arg): - print("removed arg:", arg) - else: - filtered_args.append(arg) - - # run the actual command in argv[1] - subprocess.run([sys.argv[1]] + filtered_args, check=True) - - - diff --git a/recipes/recipes_emscripten/netcdf4/recipe.yaml b/recipes/recipes_emscripten/netcdf4/recipe.yaml index 4be72a531a8..54d891c22e6 100644 --- a/recipes/recipes_emscripten/netcdf4/recipe.yaml +++ b/recipes/recipes_emscripten/netcdf4/recipe.yaml @@ -1,6 +1,6 @@ context: - version: "1.7.2" - name: "netcdf4" + version: 1.7.4 + name: netcdf4 package: name: ${{ name }} @@ -8,9 +8,15 @@ package: source: url: https://github.com/Unidata/netcdf4-python/archive/refs/tags/v${{ version }}rel.tar.gz - sha256: cce7d42a83f84b6ce6288bb2fb171d5ffd294f1a1ba2650807d238ae961e9629 + sha256: c792977eb762fd29fa46b78f44dd8c15729fe7733c2cd2ecd34552089734ce4b + patches: + - patches/0001-Fix-unknown-arg-R-PREFIX-lib.patch + build: - number: 1 + number: 0 + script: + - export LDFLAGS="-L$PREFIX/lib -lhdf5 $LDFLAGS" + - ${PYTHON} -m pip install . -vvv requirements: build: