claude-noether
109858eae5
Follow-up to #10. The subdir layout I assumed worked turned out to not work — per 'man PKGBUILD': The filename in the array must NOT include any path components like ./ makepkg's source-staging only honors basenames; the patches/ subdir references staged the files but the basename-lookup at apply time failed with the same 'not found in build directory' error that #9 hit. I copied the chromium-fourier convention thinking it was proven, but chromium-fourier has no CI either and likely has the same latent breakage (separate issue, not in this PR's scope). The actually-working pattern is the mpv-fourier one: patches at the top level next to the PKGBUILD. mpv-fourier iter2 just built green on CI (#92) with that layout. This commit: - Moves all 8 patches (5 fourier + 3 arch upstream) from patches/ to arch/firefox-fourier/ via git mv (preserves blame). - Removes the now-empty patches/ subdir. - Strips 'patches/' prefix from source array entries. - Strips '/patches' from prepare() patch -i paths. No semantic change to the patch content or apply order. pkgrel 3 -> 4.
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Hochheiden <ahochheiden@mozilla.com>
|
|
Date: Wed, 1 Apr 2026 18:11:37 +0000
|
|
Subject: [PATCH] Bug 2023597 - Use `wasm32-wasip1` target for clang >= 22.1
|
|
r=firefox-build-system-reviewers,sergesanspaille
|
|
|
|
https://github.com/llvm/llvm-project/pull/165345
|
|
https://releases.llvm.org/22.1.0/tools/clang/docs/ReleaseNotes.html
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D291023
|
|
---
|
|
build/moz.configure/toolchain.configure | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
|
index a37ed610cc43..c7d0c8bdf75c 100644
|
|
--- a/build/moz.configure/toolchain.configure
|
|
+++ b/build/moz.configure/toolchain.configure
|
|
@@ -695,6 +695,9 @@ def check_compiler(configure_cache, compiler, language, target, android_version)
|
|
# This makes clang define __ANDROID_API__ and use versioned library
|
|
# directories from the NDK.
|
|
toolchain = "%s%d" % (target.toolchain, android_version)
|
|
+ elif target.kernel == "WASI" and info.type == "clang" and info.version >= Version("22.1"):
|
|
+ # The wasm32-wasi target was renamed to wasm32-wasip1 in LLVM 22.1.
|
|
+ toolchain = "wasm32-wasip1"
|
|
else:
|
|
toolchain = target.toolchain
|
|
|