firefox/wasi-sdk: upgrade wasi-sdk 21->29

This update is an optional build-time requirement for Firefox 144+ to be
able to build some sandboxed libraries.

Since the build system was overhauled by upstream, the original recipe
was split into two also: one recipe builds the toolchain (which is essentially
a WebAssembly-only clang), and the second recipe populates the actual sysroot.

Though they use the same main CMakeLists.txt file, the environment is quite
different for the two steps, hence the split.

One notable change is that building this recipe requires at least Clang 18,
which is a bump from the previous Clang 14. Though Kirkstone can still build
it, it requires switching to a new meta-clang branch.

Signed-off-by: Gyorgy Sarvari <[email protected]>

Author: OldManYellsAtCloud

meta-firefox/conf/post-whinlatter-s-config.inc

@@ -11,4 +11,7 @@ CORRECT_S = '${@bb.utils.contains_any("LAYERSERIES_CORENAMES", "whinlatter", d.g
 
 S:pn-cbindgen = "${CORRECT_S}"
 S:pn-cbindgen-native = "${CORRECT_S}"
-S:pn-wasi-sdk-native = "${CORRECT_S}"
+S:pn-wasi-sdk-sysroot-native = "${CORRECT_S}"
+S:pn-wasi-sdk-toolchain-native = "${CORRECT_S}"
+S:pn-wasm-component-ld = "${CORRECT_S}"
+S:pn-wasm-component-ld-native = "${CORRECT_S}"

meta-firefox/recipes-browser/firefox/firefox.inc

@@ -130,7 +130,7 @@ PACKAGECONFIG[system-pipewire] = "--with-system-pipewire,,pipewire,pipewire"
 PACKAGECONFIG[system-gbm] = "--with-system-gbm,,virtual/libgbm,libgbm"
 PACKAGECONFIG[system-libdrm] = "--with-system-libdrm,,libdrm,libdrm"
 
-DEPENDS:append = '${@bb.utils.contains("PACKAGECONFIG", "disable-sandboxed-libraries", "", " wasi-sdk-native ", d)}'
+DEPENDS:append = '${@bb.utils.contains("PACKAGECONFIG", "disable-sandboxed-libraries", "", " wasi-sdk-sysroot-native ", d)}'
 
 LDFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'system-av1', ' -Wl,--undefined-version ', '', d)}"
 

meta-firefox/recipes-devtools/wasi-sdk/files/0001-allow-compiling-with-cmake-4.patch

@@ -0,0 +1,44 @@
+From 1fdbaaa58d6b816f4280db5de418112b9ff50c48 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <[email protected]>
+Date: Wed, 26 Nov 2025 13:15:30 +0100
+Subject: [PATCH] don't build wasm-component-ld
+
+wasm-component-ld is fetched from the internet. For OE, it is built
+with a separate recipe, no need to build it here also.
+
+Signed-off-by: Gyorgy Sarvari <[email protected]>
+---
+ cmake/wasi-sdk-toolchain.cmake | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake
+index 61481e3..f68d288 100644
+--- a/cmake/wasi-sdk-toolchain.cmake
++++ b/cmake/wasi-sdk-toolchain.cmake
+@@ -116,26 +116,6 @@ install(DIRECTORY ${wasi_tmp_install}/bin ${wasi_tmp_install}/lib ${wasi_tmp_ins
+         USE_SOURCE_PERMISSIONS
+         DESTINATION ${CMAKE_INSTALL_PREFIX})
+ 
+-# Build logic for `wasm-component-ld` installed from Rust code.
+-set(wasm_component_ld_root ${CMAKE_CURRENT_BINARY_DIR}/wasm-component-ld)
+-set(wasm_component_ld ${wasm_component_ld_root}/bin/wasm-component-ld${CMAKE_EXECUTABLE_SUFFIX})
+-set(wasm_component_ld_version 0.5.19)
+-if(RUST_TARGET)
+-  set(rust_target_flag --target=${RUST_TARGET})
+-endif()
+-add_custom_command(
+-  OUTPUT ${wasm_component_ld}
+-  COMMAND
+-    cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
+-      wasm-component-ld@${wasm_component_ld_version}
+-  COMMAND
+-    cmake -E make_directory ${wasi_tmp_install}/bin
+-  COMMAND
+-    cmake -E copy ${wasm_component_ld} ${wasi_tmp_install}/bin
+-  COMMENT "Building `wasm-component-ld` ...")
+-add_custom_target(wasm-component-ld DEPENDS ${wasm_component_ld})
+-add_dependencies(build wasm-component-ld)
+-
+ # Setup installation logic for CMake support files.
+ add_custom_target(misc-files)
+ add_dependencies(build misc-files)

meta-firefox/recipes-devtools/wasi-sdk/files/0001-disable-exceptions-and-bulk-memory.patch

@@ -0,0 +1,31 @@
+From a4ef37515d280b0000de3f3b9a16a58aec91ab95 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <[email protected]>
+Date: Wed, 26 Nov 2025 16:04:11 +0100
+Subject: [PATCH] don't strip symbols from binaries
+
+By default the project is trying to shrink their footprint by
+stripping the debug symbols from the binaries, which however
+makes the relevant QA check complain.
+
+This patch removes the stripping.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Gyorgy Sarvari <[email protected]>
+---
+ cmake/wasi-sdk-toolchain.cmake | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake
+index 61481e3..5f04af4 100644
+--- a/cmake/wasi-sdk-toolchain.cmake
++++ b/cmake/wasi-sdk-toolchain.cmake
+@@ -90,9 +90,6 @@ ExternalProject_Add(llvm-build
+     -DLLVM_DEFAULT_TARGET_TRIPLE=wasm32-wasi
+     -DLLVM_INSTALL_BINUTILS_SYMLINKS=TRUE
+     -DLLVM_ENABLE_LIBXML2=OFF
+-    # Pass `-s` to strip symbols by default and shrink the size of the
+-    # distribution
+-    -DCMAKE_EXE_LINKER_FLAGS=-s
+     ${llvm_cmake_flags_list}
+   # See https://www.scivision.dev/cmake-externalproject-list-arguments/ for
+   # why this is in `CMAKE_CACHE_ARGS` instead of above

meta-firefox/recipes-devtools/wasi-sdk/files/0001-don-t-build-wasm-component-ld.patch

@@ -0,0 +1,29 @@
+From 6c777445050d715512acd2ac0d419992bc224da7 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <[email protected]>
+Date: Wed, 26 Nov 2025 13:06:22 +0100
+Subject: [PATCH] lower cmake requirement
+
+Kirkstone has CMake 3.22, but the minimum is specified as 3.26.
+
+Lower it, so it can be built on Kirkstone - the cmake files are
+fairly straightforward and simple, without very arcane options.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Gyorgy Sarvari <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a0d3fca..22ef298 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ # WASI sysroot build requires this previous compiler and must be runnable on
+ # the host.
+ 
+-cmake_minimum_required(VERSION 3.26)
++cmake_minimum_required(VERSION 3.22)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ project(wasi-sdk)
+ include(ExternalProject)

meta-firefox/recipes-devtools/wasi-sdk/files/0001-don-t-strip-symbols-from-binaries.patch

@@ -0,0 +1,28 @@
+require wasi-sdk.inc
+
+DEPENDS += "wasi-sdk-toolchain-native wasm-component-ld-native"
+RDEPENDS:${PN} = "wasi-sdk-toolchain-native wasm-component-ld-native"
+
+EXTRA_OECMAKE += " \
+    -DCMAKE_TOOLCHAIN_FILE=${RECIPE_SYSROOT_NATIVE}/usr/share/wasi-sysroot/share/cmake/wasi-sdk.cmake \
+    -DCMAKE_C_COMPILER_WORKS=ON \
+    -DCMAKE_CXX_COMPILER_WORKS=ON \
+    "
+
+BUILD_LD = "wasm-ld"
+
+# wasi-sysroot is built for wasi target, not for host/target
+CFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+CMAKE_C_LINK_FLAGS = ""
+CMAKE_CXX_LINK_FLAGS = ""
+OECMAKE_C_LINK_FLAGS = ""
+OECMAKE_CXX_LINK_FLAGS = ""
+BUILD_CC = ""
+COMPILER_RT:remove = "-rtlib=libgcc"
+
+do_install:append(){
+    install -d ${D}${datadir}/wasi-sysroot/lib/clang/${WASI_CLANG_VERSION}
+    mv ${D}${prefix}/clang-resource-dir/lib ${D}${datadir}/wasi-sysroot/lib/clang/${WASI_CLANG_VERSION}/
+}

meta-firefox/recipes-devtools/wasi-sdk/files/0001-lower-cmake-requirement.patch

@@ -0,0 +1,10 @@
+require wasi-sdk.inc
+EXTRA_OECMAKE = "-DWASI_SDK_BUILD_TOOLCHAIN=ON"
+
+do_install:append(){
+    ln -s ../../../lib/libedit.so.0 ${D}${datadir}/wasi-sysroot/lib/libedit.so.0
+    ln -s ../../../lib/libtinfo.so.5 ${D}${datadir}/wasi-sysroot/lib/libtinfo.so.5
+}
+
+# Wasi-sdk builds its own sysroot
+prefix .= "/share/wasi-sysroot"