Skip to content

Commit

Permalink
Avoid linking to libc++ in side modules
Browse files Browse the repository at this point in the history
  • Loading branch information
kleisauke committed Nov 12, 2023
1 parent a860e6b commit 3ac7ca7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to wasm-vips will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.0.7] - TBD

Uses libvips v8.15.0, compiled with Emscripten v3.1.48.

### Fixed

- Avoid linking to libc++ in side modules (regression in 0.0.6).

## [v0.0.6] - 2023-11-11

Uses libvips v8.15.0, compiled with Emscripten v3.1.48.
Expand Down Expand Up @@ -131,6 +139,7 @@ Uses libvips v8.10.0, compiled with Emscripten v2.0.0.

- Initial release.

[v0.0.7]: https://github.com/kleisauke/wasm-vips/compare/v0.0.6...v0.0.7
[v0.0.6]: https://github.com/kleisauke/wasm-vips/compare/v0.0.5...v0.0.6
[v0.0.5]: https://github.com/kleisauke/wasm-vips/compare/v0.0.4...v0.0.5
[v0.0.4]: https://github.com/kleisauke/wasm-vips/compare/v0.0.3...v0.0.4
Expand Down
9 changes: 7 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,13 @@ node --version
-DCMAKE_CXX_FLAGS="$CXXFLAGS -D__EMSCRIPTEN_STANDALONE_WASM__" \
-DENABLE_MULTITHREADING_SUPPORT=FALSE # Disable threading support, we rely on libvips' thread pool.
make -C _build install
# Ensure we don't link with libsharpyuv in the vips-heif side module
[ -z "$ENABLE_MODULES" ] || sed -i '/^Requires.private:/s/ libsharpyuv//' $TARGET/lib/pkgconfig/libheif.pc
if [ -n "$ENABLE_MODULES" ]; then
# Ensure we don't link with libsharpyuv in the vips-heif side module
sed -i '/^Requires.private:/s/ libsharpyuv//' $TARGET/lib/pkgconfig/libheif.pc
# ... and the same for -lc++, see:
# https://github.com/emscripten-core/emscripten/issues/16680#issuecomment-1558015445
sed -i '/^Libs.private:/s/-lc++//g' $TARGET/lib/pkgconfig/libheif.pc
fi
)

[ -f "$TARGET/lib/pkgconfig/vips.pc" ] || (
Expand Down

0 comments on commit 3ac7ca7

Please sign in to comment.