head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.42
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.40
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.38
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.36
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.34
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.32
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.30
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.28
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.26
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.24
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.22
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.20
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.18
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.16
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.14
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.12
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.10
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.8
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.6
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.4
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.2
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.1.0.2
	pkgsrc-2020Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2021.01.10.14.12.15;	author jperkin;	state Exp;
branches;
next	1.1;
commitid	ZKPyXIRuB7lEEbDC;

1.1
date	2020.12.05.12.03.26;	author nia;	state Exp;
branches;
next	;
commitid	Jn4TOYwMCsyP5yyC;


desc
@@


1.2
log
@mozjs78: Fix rust target on SunOS.
@
text
@$NetBSD: patch-build_moz.configure_rust.configure,v 1.1 2020/12/05 12:03:26 nia 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
@@@@ -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
-                   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
@


1.1
log
@mozjs78: Fix configure where the readline library isn't builtin.

This commit also moves the location of WRKSRC so that no patches are
applied to files in parent directories of WRKSRC.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
d9 11
a19 1
@@@@ -337,7 +337,8 @@@@ def rust_triple_alias(host_or_target, ho
@