summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2018-09-20 16:43:34 +0200
committerThomas Orgis2018-09-21 08:33:48 +0200
commitd5c25ecb00db92f97c9821b61a26887f74daf7ff (patch)
treefccfd947aad2b6c0af0790b4d5eeecab7a34e519
parentef352f81be3138aaec60eeed318f4a6f06ea5bfd (diff)
firefox-esr: port over patch to fix build with rust 1.29
-rw-r--r--http/firefox-esr/HISTORY5
-rwxr-xr-xhttp/firefox-esr/PRE_BUILD2
-rw-r--r--http/firefox-esr/patches/rust-fuchsia-targets.patch12
3 files changed, 18 insertions, 1 deletions
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 57c831d139..d09dd8e4a5 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,5 +1,10 @@
+2018-09-20 Thomas Orgis <sobukus@sourcemage.org>
+ * PRE_BUILD, patches/rust-fuchsia-targets.patch: fix build
+ with modern rust that has two-component triplets
+
2018-09-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: SECURITY_PATCH++ for 60.2.0esr
+
2018-09-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 60.2.0esr
diff --git a/http/firefox-esr/PRE_BUILD b/http/firefox-esr/PRE_BUILD
index 36f6bf4024..853848b115 100755
--- a/http/firefox-esr/PRE_BUILD
+++ b/http/firefox-esr/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-#apply_patch_dir patches &&
+apply_patch_dir patches &&
# To remove version suffix from some directories
diff --git a/http/firefox-esr/patches/rust-fuchsia-targets.patch b/http/firefox-esr/patches/rust-fuchsia-targets.patch
new file mode 100644
index 0000000000..55c1e1658d
--- /dev/null
+++ b/http/firefox-esr/patches/rust-fuchsia-targets.patch
@@ -0,0 +1,12 @@
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -119,6 +119,8 @@
+ ambiguous = set()
+ per_raw_os = {}
+ for t in out:
++ if t.endswith("fuchsia"):
++ t = t + "-fuchsia"
+ t = split_triplet(t, allow_unknown=True)
+ key = (t.cpu, t.endianness, t.os)
+ if key in per_os: