On Fri, May 15, 2026 at 03:39:06PM +0200, Landry Breuil wrote:
> Le Fri, May 15, 2026 at 03:16:57PM +0200, Caspar Schutijser a écrit :
> > On Fri, May 15, 2026 at 10:06:44AM +0200, Caspar Schutijser wrote:
> >
> > And here is what that looks like (it's a straightforward adaptation of
> > your changes to firefox-esr). It builds and runs successfully.
> > Next I'll check if the browser builds successfully with the patches
> > applied but when still using LLVM 19. If that's the case then indeed
> > the patches could already be committed ahead of the actual switch to
> > LLVM 22.
>
> perfect, many thanks for that testing :)
Thanks for working on the wasi-* update!
> i guess once we know a
> potential timeframe for the llvm 22 switch in the portstree we'll switch
> some days in advance.
Indeed. FWIW, caspar@ for that btw.
The build with the wasi stack updated but using LLVM 19 succeeded.
However, compared to applying the full patch that you prepared for the
consumers, one has to apply the diff below (i.e., remove some Makefile
bits and remove patches/patch-build_moz_configure_toolchain_configure,
as that one is specific to LLVM 22).
Caspar
diff --git a/browser/Makefile b/browser/Makefile
index 6214675..4f72508 100644
--- a/browser/Makefile
+++ b/browser/Makefile
@@ -41,8 +41,6 @@ PATCHFILES.p=
bug-2038504-backport-bug-D262840-to-esr140.patch{attachment.cgi?id
PATCH_DIST_STRIP = -p1 -f
COMPILER = ports-clang
-MODCLANG_VERSION = 22
-USE_LLD = ports
# tor-browser needs built-in nss
MOZILLA_USE_BUNDLED_NSS = Yes
@@ -51,9 +49,9 @@ BUILD_DEPENDS += lang/node
# 63 requires cbindgen #1478813
BUILD_DEPENDS += devel/cbindgen>=0.23.0
# wasi
-BUILD_DEPENDS += lang/wasi-sdk/compiler-rt,llvm22 \
- lang/wasi-sdk/libcxx,llvm22 \
- lang/wasi-libc,llvm22
+BUILD_DEPENDS += lang/wasi-sdk/compiler-rt \
+ lang/wasi-sdk/libcxx \
+ lang/wasi-libc
# mach uses pkg_resources
BUILD_DEPENDS += devel/py-setuptools
BUILD_DEPENDS += textproc/jq
diff --git a/browser/patches/patch-build_moz_configure_toolchain_configure
b/browser/patches/patch-build_moz_configure_toolchain_configure
deleted file mode 100644
index 0cc235e..0000000
--- a/browser/patches/patch-build_moz_configure_toolchain_configure
+++ /dev/null
@@ -1,14 +0,0 @@
-allow building with a wasi stack built with llvm22
-
-adapted from https://hg-edge.mozilla.org/mozilla-central/rev/b1b4f0d7ed12
---- build/moz.configure/toolchain.configure.orig
-+++ build/moz.configure/toolchain.configure
-@@ -1122,7 +1122,7 @@ def compiler_wrapper(wrapper, ccache):
-
- @dependable
- def wasm():
-- return split_triplet("wasm32-wasi", allow_wasi=True)
-+ return split_triplet("wasm32-wasip1", allow_wasi=True)
-
-
- @template
