firefox: fix target detection, closes #164

2023-10-30 23:05:35 +05:30 · 2023-10-30 23:05:35 +05:30 · bad7af195a
parent 5014024faf
commit bad7af195a
3 changed files with 21 additions and 0 deletions
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@ -1,4 +1,5 @@
 d86c192c0cfb9d2df3ca2376b6503c282794040d301561ee213473ae1dc0663aa8
+3e4e722acd2ab2e38a16ec23b29296318d77cc54f034d4b21d91bde085e26bc0a3
 49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5
 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc
 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8
--- a/extra/firefox/patches/fix-target-detection.patch
+++ b/extra/firefox/patches/fix-target-detection.patch
@ -0,0 +1,19 @@
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index 7a2fd1a..ba5ba62 100644
+--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
+@@ -403,9 +403,13 @@ def detect_rustc_target(
+         ]
+         if len(narrowed) == 1:
+             return narrowed[0].rust_target
+        elif narrowed:
+            candidates = narrowed
+
+        aliased_vendor = "unknown" if host_or_target.vendor == "pc" else host_or_target.vendor
+ 
+         # Finally, see if the vendor can be used to disambiguate.
+-        narrowed = [c for c in candidates if c.target.vendor == host_or_target.vendor]
+        narrowed = [c for c in candidates if c.target.vendor == aliased_vendor]
+         if len(narrowed) == 1:
+             return narrowed[0].rust_target
+ 
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@ -1,4 +1,5 @@
 https://ftp.mozilla.org/pub/firefox/releases/119.0/source/firefox-119.0.source.tar.xz
+patches/fix-target-detection.patch
 patches/fix-vaapi.patch
 patches/musl-sandbox.patch
 patches/no-atk.patch