aboutsummaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py')
-rw-r--r--www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py42
1 files changed, 30 insertions, 12 deletions
diff --git a/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py b/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py
index ceac29623f79..94584d8b160b 100644
--- a/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py
+++ b/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py
@@ -1,11 +1,26 @@
---- python/mozbuild/mozbuild/gn_processor.py.orig 2022-07-16 21:13:05.389103000 +0200
-+++ python/mozbuild/mozbuild/gn_processor.py 2022-07-16 21:15:28.755882000 +0200
-@@ -652,15 +652,15 @@
+commit 6bfdff4afcc9e3843b9c3a5d7e884e281a305398
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ chase gn_processor.py changes
+
+diff --git python/mozbuild/mozbuild/gn_processor.py python/mozbuild/mozbuild/gn_processor.py
+index a77b6c7759f1..e5498ac5e9df 100644
+--- python/mozbuild/mozbuild/gn_processor.py
++++ python/mozbuild/mozbuild/gn_processor.py
+@@ -185,6 +185,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target):
+ }
+ oses = {
+ "android": "Android",
++ "freebsd": "FreeBSD",
+ "linux": "Linux",
+ "mac": "Darwin",
+ "openbsd": "OpenBSD",
+@@ -742,17 +743,17 @@ def main():
vars_set = []
for is_debug in (True, False):
- for target_os in ("android", "linux", "mac", "openbsd", "win"):
-+ for target_os in ("android", "freebsd", "linux", "mac", "openbsd", "win"):
++ for target_os in ("freebsd",):
target_cpus = ["x64"]
- if target_os in ("android", "linux", "mac", "win", "openbsd"):
+ if target_os in ("android", "freebsd", "linux", "mac", "win", "openbsd"):
@@ -15,17 +30,20 @@
- if target_os in ("android", "linux", "win"):
+ if target_os in ("android", "freebsd", "linux", "win"):
target_cpus.append("x86")
+- if target_os in ("linux", "openbsd"):
++ if target_os in ("freebsd", "linux", "openbsd"):
+ target_cpus.append("riscv64")
- if target_os == "linux":
+ if target_os in ("freebsd", "linux"):
- target_cpus.append("ppc64")
+ target_cpus.extend(["ppc64", "mipsel", "mips64el"])
for target_cpu in target_cpus:
vars = {
-@@ -674,7 +674,7 @@
+@@ -761,7 +762,7 @@ def main():
+ "target_cpu": target_cpu,
+ "target_os": target_os,
+ }
+- if target_os == "linux":
++ if target_os in ("freebsd", "linux"):
+ for use_x11 in (True, False):
vars["use_x11"] = use_x11
vars_set.append(vars.copy())
- else:
-- if target_os == "openbsd":
-+ if target_os in ("freebsd", "openbsd"):
- vars["use_x11"] = True
- vars_set.append(vars)
-