summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/iceweasel/0002-Fix-triplet-two-parts.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/libre/iceweasel/0002-Fix-triplet-two-parts.patch b/libre/iceweasel/0002-Fix-triplet-two-parts.patch
new file mode 100644
index 000000000..0c0f0c0ec
--- /dev/null
+++ b/libre/iceweasel/0002-Fix-triplet-two-parts.patch
@@ -0,0 +1,20 @@
+--- iceweasel-61.0.2.orig/build/moz.configure/init.configure 2018-11-02 13:44:54.417972000 -0500
++++ iceweasel-61.0.2/build/moz.configure/init.configure 2018-11-02 13:47:03.932066745 -0500
+@@ -591,7 +591,16 @@
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+- cpu, manufacturer, os = triplet.split('-', 2)
++ # Additionally, some may omit "unknown" when the manufacturer
++ # is not specified and emit
++ # CPU_TYPE-OPERATING_SYSTEM
++ parts = triplet.split('-', 2)
++ if len(parts) == 3:
++ cpu, _, os = parts
++ elif len(parts) == 2:
++ cpu, os = parts
++ else:
++ die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our