Skip to content

[TheOneric] Update emscripten 2.0.34 #39

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

Merged
merged 5 commits into from
Dec 23, 2022

Conversation

dmitrylyzo
Copy link
Collaborator

Pulling from the upstream.
Original author: TheOneric

Part of libass#135

Future emscripten versions warn if link-only options
are set during compilation.

Cherry-picked from: libass@9b1fc2e

make: also specify optimisation level for linking

With emscripten, LLVM is translated to JS during linking
and the optimisation level also has an effect here.
This was a regression from 9b1fc2e
and apart from performance also brings the total size of the distributed
files back down to ~7MiB from ~19MiB after the options were split.

Cherry-picked from: libass@952afbd
All builds but brotli already set NO_EXIT_RUNTIME, and in brotli's case
it was probably an oversight for the flag to be missing.
All dependencies, but not the final jso linkage also set MODULARIZE,
but not -s 'EXPORT_NAME="someting"' as emscripten docs suggest should be
done. But since we only use static libs, the final ones are also
actually the only linking occuring, so just remove the flag.

Cherry-picked from: libass@ebcfe36
It's a link-only setting and since we only build
static libs only relevant in the final linking step.

Cherry-picked from: libass@8d41bd1
This is no longer implied in future emscripten versions.

Cherry-picked from: libass@6bee3c8
Freetype upstream made changes to remove the need for our fcstat patch,
but we actually also need to update emscripten as linking to fstatfs is
bugged in our currently used version and will lead to runtime errors.

- Since emscripten 2.0.26 unresolved symbols cause errors at link time
  instead of only at runtime.
- The following commit contained in 2.0.27 fixed fstatfs linking:
    emscripten-core/emscripten@2126d3c

Cherry-picked from: libass@f92d7ce
@dmitrylyzo dmitrylyzo merged commit 31f38a6 into jellyfin:master Dec 23, 2022
@dmitrylyzo dmitrylyzo deleted the TheOneric/update-emscripten branch December 23, 2022 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants