From 25edac704a94a64be0c585e75b73a09f857ce648 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 13 Dec 2024 09:57:23 +0100 Subject: [PATCH 1/4] 3.1.73 --- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index f826caabc..d57957195 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -1,9 +1,9 @@ context: name: emscripten_emscripten-wasm32 - version: 3.1.45 + version: 3.1.73 build: - number: 29 + number: 0 outputs: - package: From e4618fbc7550cace10da736238c6c597e30e59c9 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 13 Dec 2024 09:58:49 +0100 Subject: [PATCH 2/4] merged --- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index 466efdd05..e52a5cbef 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -5,7 +5,6 @@ context: build: number: 0 - outputs: - package: name: ${{ name|lower }} From 20d5cacf67e8ca189ee6774711aa3ed4ff4bd4f4 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 13 Dec 2024 10:21:25 +0100 Subject: [PATCH 3/4] change patch --- ...Object-and-fs.readFile-in-loadLibDat.patch | 21 ++--------- ...l-error-when-symbol-resolution-fails.patch | 37 ------------------- 2 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch diff --git a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch index 5212949cd..7ec691b55 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch +++ b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch @@ -1,19 +1,8 @@ -From 0170462a78e86de9ee95017bfa7e4a3dd620a375 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Fri, 2 Jun 2023 11:59:32 -0700 -Subject: [PATCH] Add back fs.findObject and fs.readFile in loadLibData - -See upstream PR: -https://github.com/emscripten-core/emscripten/pull/19513 ---- - src/library_dylink.js | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - diff --git a/src/library_dylink.js b/src/library_dylink.js -index d7676cdc2..f616d230d 100644 +index 748468aae..c540877b3 100644 --- a/src/library_dylink.js +++ b/src/library_dylink.js -@@ -993,14 +993,23 @@ var LibraryDylink = { +@@ -1013,15 +1013,23 @@ var LibraryDylink = { #endif // for wasm, we can use fetch for async, but for fs mode we can only imitate it @@ -27,6 +16,7 @@ index d7676cdc2..f616d230d 100644 + libData = HEAP8.slice(data, data + dataSize); } } +- + if (!libData && flags.fs && flags.fs.findObject(libName)) { + libData = flags.fs.readFile(libName, {encoding: 'binary'}); + if (!(libData instanceof Uint8Array)) { @@ -36,9 +26,6 @@ index d7676cdc2..f616d230d 100644 + if (libData) { + return flags.loadAsync ? Promise.resolve(libData) : libData; + } - var libFile = locateFile(libName); if (flags.loadAsync) { --- -2.25.1 - + return asyncLoad(libFile); diff --git a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch deleted file mode 100644 index ec50727a1..000000000 --- a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a8bdb50a29062ee70c8667e4fd94dde47917f8fa Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Fri, 19 May 2023 12:19:00 -0700 -Subject: [PATCH] Add useful error when symbol resolution fails - -Currently if symbol resolution fails, we get: -```js -TypeError: Cannot read properties of undefined (reading 'apply') -``` -It is very hard for newcomers to Emscripten to recognize this as a -symbol resolution error. Even for people experienced with this message, -it has the annoyance that it doesn't give any hint as to which symbol -went missing. - -This adds a descriptive error message with the name of the missing -symbol. ---- - src/library_dylink.js | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/library_dylink.js b/src/library_dylink.js -index d96e6b425..7f63b5c5e 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -727,6 +727,9 @@ var LibraryDylink = { - var resolved; - stubs[prop] = function() { - if (!resolved) resolved = resolveSymbol(prop); -+ if (!resolved) { -+ throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`); -+ } - return resolved.apply(null, arguments); - }; - } --- -2.25.1 - From 4bfcd3daa7157cc5e6cdae42da3c326e478ce839 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 13 Dec 2024 10:38:24 +0100 Subject: [PATCH 4/4] change workflow --- .github/workflows/build_recipes.yaml | 2 +- conda_build_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 4c008a4dc..8cb128fee 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -2,7 +2,7 @@ name: build recipes on: push: branches: - - 'main' + - 'emscripten-3.1.73' paths: - 'recipes/**' pull_request: diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 3b5f1b773..3814d02e8 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -25,7 +25,7 @@ cxx_compiler: c_compiler_version: - if: emscripten then: - - 3.1.45 + - 3.1.73 - if: linux then: - 9 @@ -37,7 +37,7 @@ c_compiler_version: cxx_compiler_version: - if: emscripten then: - - 3.1.45 + - 3.1.73 - if: linux then: - 9