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.

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

Emscripten 3.1.73 #1463

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build_recipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build recipes
on:
push:
branches:
- 'main'
- 'emscripten-3.1.73'
paths:
- 'recipes/**'
pull_request:
Expand Down
4 changes: 2 additions & 2 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler:
c_compiler_version:
- if: emscripten
then:
- 3.1.45
- 3.1.73
- if: linux
then:
- 9
Expand All @@ -37,7 +37,7 @@ c_compiler_version:
cxx_compiler_version:
- if: emscripten
then:
- 3.1.45
- 3.1.73
- if: linux
then:
- 9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
From 0170462a78e86de9ee95017bfa7e4a3dd620a375 Mon Sep 17 00:00:00 2001
From: Hood Chatham <[email protected]>
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
Expand All @@ -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)) {
Expand All @@ -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);

This file was deleted.

4 changes: 2 additions & 2 deletions recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
context:
name: emscripten_emscripten-wasm32
version: 3.1.45
version: 3.1.73

build:
number: 30
number: 0

outputs:
- package:
Expand Down
Loading