From d14499fb9542b80a36987ca45de55d3a8aeae365 Mon Sep 17 00:00:00 2001 From: emscripten-forge-bot Date: Mon, 23 Jun 2025 01:26:45 +0000 Subject: [PATCH 1/5] Update r-base from 4.5.0 to 4.5.1 --- recipes/recipes_emscripten/r-base/recipe.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/recipes_emscripten/r-base/recipe.yaml b/recipes/recipes_emscripten/r-base/recipe.yaml index 47c3246cc..84ee8f8a2 100644 --- a/recipes/recipes_emscripten/r-base/recipe.yaml +++ b/recipes/recipes_emscripten/r-base/recipe.yaml @@ -1,6 +1,6 @@ context: name: r-base - version: 4.5.0 + version: 4.5.1 package: name: ${{ name }} @@ -8,7 +8,7 @@ package: source: url: https://cran.r-project.org/src/base/R-4/R-${{ version }}.tar.gz - sha256: 3b33ea113e0d1ddc9793874d5949cec2c7386f66e4abfb1cef9aec22846c3ce1 + sha256: b42a7921400386645b10105b91c68728787db5c4c83c9f6c30acdce632e1bb70 patches: # https://github.com/IsabelParedes/r-source/tree/R-4.5.0-wasm - patches/0001-Add-emscripten-platform-to-configure-script.patch @@ -80,7 +80,8 @@ about: license: GPL-2.0-or-later license_family: GPL license_file: COPYING - summary: R is a free software environment for statistical computing and graphics. + summary: R is a free software environment for statistical computing and + graphics. extra: recipe-maintainers: From e9a6088a1a0d37fa4315fa0cc08e3a81dc9490e7 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 24 Jun 2025 16:37:15 +0200 Subject: [PATCH 2/5] Fix linux build --- recipes/recipes_emscripten/r-base/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/recipes_emscripten/r-base/build.sh b/recipes/recipes_emscripten/r-base/build.sh index 7e456bd45..0598e8e36 100644 --- a/recipes/recipes_emscripten/r-base/build.sh +++ b/recipes/recipes_emscripten/r-base/build.sh @@ -59,6 +59,8 @@ pushd _build_linux export LINUX_BUILD_DIR=$(pwd) unset CROSS_COMPILING + unset FFLAGS + unset FPICFLAGS ../configure \ --prefix=$BUILD_PREFIX \ From d8fdb913025f791d6ba3c47ff2fbc6a4c01823ca Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 24 Jun 2025 16:44:40 +0200 Subject: [PATCH 3/5] Copy Fortran runtime lib --- recipes/recipes_emscripten/r-base/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/recipes_emscripten/r-base/build.sh b/recipes/recipes_emscripten/r-base/build.sh index 0598e8e36..156f308d6 100644 --- a/recipes/recipes_emscripten/r-base/build.sh +++ b/recipes/recipes_emscripten/r-base/build.sh @@ -80,6 +80,9 @@ popd # opendir during the configure step. Link with libz.a instead. rm $PREFIX/lib/libz.so* || true +# FIXME: this should come from libflang +cp $BUILD_PREFIX/lib/libFortranRuntime_emscripten-wasm32.a $PREFIX/lib/libFortranRuntime.a + mkdir -p _build_wasm pushd _build_wasm ( From 9a93ca8db9b2f7add4befafd31c294fbcbbc4032 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 24 Jun 2025 17:06:29 +0200 Subject: [PATCH 4/5] Unpackage Fortran lib --- recipes/recipes_emscripten/r-base/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/recipes_emscripten/r-base/build.sh b/recipes/recipes_emscripten/r-base/build.sh index 156f308d6..245e3e727 100644 --- a/recipes/recipes_emscripten/r-base/build.sh +++ b/recipes/recipes_emscripten/r-base/build.sh @@ -111,3 +111,5 @@ pushd _build_wasm ) popd + +rm $PREFIX/lib/libFortranRuntime.a From 66f08335f82761d1dc98047450669465d6ef2351 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 24 Jun 2025 17:07:58 +0200 Subject: [PATCH 5/5] Clean up --- recipes/recipes_emscripten/r-base/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/recipes_emscripten/r-base/recipe.yaml b/recipes/recipes_emscripten/r-base/recipe.yaml index 84ee8f8a2..c94d03d04 100644 --- a/recipes/recipes_emscripten/r-base/recipe.yaml +++ b/recipes/recipes_emscripten/r-base/recipe.yaml @@ -52,7 +52,7 @@ requirements: - libiconv - zlib>=1.2.13 - bzip2 - - xz # for lzma + - xz - pcre2>=10.43 - libpng - libtiff @@ -80,8 +80,8 @@ about: license: GPL-2.0-or-later license_family: GPL license_file: COPYING - summary: R is a free software environment for statistical computing and - graphics. + summary: | + R is a free software environment for statistical computing and graphics. extra: recipe-maintainers: