CVS commit: pkgsrc/www/firefox/patches

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Oct 28 13:04:29 UTC 2019

Added Files:
        pkgsrc/www/firefox/patches: patch-build_moz.configure_rust.configure

Log Message:
Add a forgotten patch


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure:1.6
--- /dev/null   Mon Oct 28 13:04:29 2019
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure Mon Oct 28 13:04:29 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.6 2019/10/28 13:04:29 ryoon Exp $
+
+* Do not match rumprun toolchain for NetBSD,
+  narrowed should be one not two.
+
+--- build/moz.configure/rust.configure.orig    2019-10-10 18:07:24.000000000 +0000
++++ build/moz.configure/rust.configure
+@@ -321,7 +321,8 @@ def rust_triple_alias(host_or_target, ho
+             narrowed = [
+                 c for c in candidates
+                 if c.target.raw_os == host_or_target.raw_os and
+-                   c.target.raw_cpu == host_or_target.raw_cpu
++                   c.target.raw_cpu == host_or_target.raw_cpu and
++                   not c.rust_target.endswith("-rumprun-netbsd")
+             ]
+             if len(narrowed) == 1:
+                 return narrowed[0].rust_target