mozjs78: Fix rust target on SunOS.

NetBSD · Jan 10, 2021 · 85fddf2 · 85fddf2
1 parent d09d250
commit 85fddf2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/lang/mozjs78/distinfo b/lang/mozjs78/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2020/12/30 06:10:37 gutteridge Exp $
+$NetBSD: distinfo,v 1.10 2021/01/10 14:12:15 jperkin Exp $
 
 SHA1 (mozjs78_78.4.0.orig.tar.xz) = b2c1c241f70310d545f8a3c05b9c8c11676e56a8
 RMD160 (mozjs78_78.4.0.orig.tar.xz) = cef93b6116eff9f04beeaf3dda0a42cd811d0b18
 SHA512 (mozjs78_78.4.0.orig.tar.xz) = 05a0dd27cd8f330c69bf798f9025dd560e76a1a14628af4caeeae4f7573aef9371e19edb8a8e4cd28e92e189eb3a159b4ffedb1b1bd4b806e065de433cca6ffd
 Size (mozjs78_78.4.0.orig.tar.xz) = 58319040 bytes
-SHA1 (patch-build_moz.configure_rust.configure) = 5124e8edc6b7ae319ed68d5d25a1e036b79f8a71
+SHA1 (patch-build_moz.configure_rust.configure) = 149301b4a8fb81f6c64d90672b3137ae6d68461f
 SHA1 (patch-build_moz.configure_toolchain.configure) = 930ed1aec1da8c10c80d8f31dfc5acbf2db31c5f
 SHA1 (patch-js_moz.configure) = f3d762b293761e359ac7c389059aa228949a6f0b
 SHA1 (patch-js_src_jit_AtomicOperations.h) = 19eba50673f8138bbb09c0eaca63923cadbadd26

diff --git a/lang/mozjs78/patches/patch-build_moz.configure_rust.configure b/lang/mozjs78/patches/patch-build_moz.configure_rust.configure
@@ -1,11 +1,22 @@
-$NetBSD: patch-build_moz.configure_rust.configure,v 1.1 2020/12/05 12:03:26 nia Exp $
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.2 2021/01/10 14:12:15 jperkin Exp $
 
+* Return x86_64-unknown-illumos on SunOS to fix autoconf match.
 * Do not match rumprun toolchain for NetBSD,
   narrowed should be one not two.
 
 --- build/moz.configure/rust.configure.orig	2020-11-04 10:51:54.000000000 +0000
 +++ build/moz.configure/rust.configure
-@@ -337,7 +337,8 @@ def rust_triple_alias(host_or_target, ho
+@@ -257,6 +257,9 @@ def rust_triple_alias(host_or_target, ho
+             elif not candidates:
+                 return None
+
++            if host_or_target.kernel == 'SunOS':
++                return "x86_64-unknown-illumos"
++
+             # We have multiple candidates. There are two cases where we can try to
+             # narrow further down using extra information from the build system.
+             # - For windows targets, correlate with the C compiler type
+@@ -337,7 +340,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