external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 + external/harfbuzz/thread.patch | 11 +++++++++++ 2 files changed, 12 insertions(+)
New commits: commit 8f6d4fb1a4bbb689ca748dd033ceaa87d94a1a3d Author: Stephan Bergmann <[email protected]> AuthorDate: Sun Feb 22 20:30:38 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Sun Feb 22 22:57:52 2026 +0100 external/harfbuzz: Fix emscripten build ...after 7f1335390e1a4f59f3592ac003ca9d1e4933e62f "Build harfbuzz-subset", > wasm-ld: error: --shared-memory is disallowed by hb-subset-input.cc.o because it was not compiled with 'atomics' or 'bulk-memory' features. > em++: error: '/home/tdf/lode/emsdk/upstream/bin/wasm-ld @/tmp/emscripten__e1rcozh.rsp.utf-8' failed (returned 1) > make[1]: *** [/home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/desktop/Executable_soffice_bin.mk:10: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/soffice.js] Error 1 (<https://ci.libreoffice.org/job/lo_daily_tb_linux_wasm/1338/>). Probably doesn't hurt to unconditionally add that thread_dep dependency here (which is also unconditionally used for libharfbuzz, via harfbuzz_deps). Change-Id: I6dd56a3ce61c855a734db1660d0b3280cbfdaf42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199996 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index b3b63944d0dc..61d8384e0bf0 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/harfbuzz_visibility.patch.1 \ + external/harfbuzz/thread.patch \ )) # meson will replace python3 from shebang in build commands with the diff --git a/external/harfbuzz/thread.patch b/external/harfbuzz/thread.patch new file mode 100644 index 000000000000..f5c7e0ab2dfa --- /dev/null +++ b/external/harfbuzz/thread.patch @@ -0,0 +1,11 @@ +--- src/meson.build ++++ src/meson.build +@@ -674,7 +674,7 @@ + + libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, + include_directories: incconfig, +- dependencies: [m_dep], ++ dependencies: [thread_dep, m_dep], + link_with: [libharfbuzz], + cpp_args: cpp_args + extra_hb_cpp_args, + soversion: hb_so_version,
