lang/spidermonkey78: update to 78.6.0 [1]

While here, allow building with system clang 10 on 12.2 [2]

PR:		251895 [1]
PR:		251480 [2]
Submitted by:	mikael, janm@transactionware.com [2]
Exp-run by:	antoine [1]
Reported by:	janm@transactionware.com [2]

4 files changed, 48 insertions, 14 deletions

diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index 60c7d9b58712..871d74e161f7 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	spidermonkey
-DISTVERSION=	78.4.0
-PORTREVISION=	1
+DISTVERSION=	78.6.0
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
@@ -14,8 +13,7 @@ COMMENT=	Standalone JavaScript based from Mozilla 78-esr
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
-		${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
+BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
 		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		autoconf-2.13:devel/autoconf213 \
 		rust-cbindgen>=0.8.7:devel/rust-cbindgen
@@ -52,9 +50,6 @@ CONFIGURE_ARGS=	--disable-debug \
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
-CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
-		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
-
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
@@ -65,16 +60,17 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 # Require newer Clang than what's in base system unless user opted out
+# or the base system is new enough.
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
-.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
+	${COMPILER_VERSION} < 80
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
+CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
+		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-.if ${LLVM_DEFAULT:M[678]0}
-BROKEN=		LLVM 9.0 or higher required
-.endif
 .endif
 
 post-patch:
diff --git a/lang/spidermonkey78/distinfo b/lang/spidermonkey78/distinfo
index fb8a55174add..2532ecbd1689 100644
--- a/lang/spidermonkey78/distinfo
+++ b/lang/spidermonkey78/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603124991
-SHA256 (firefox-78.4.0esr.source.tar.xz) = 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc
-SIZE (firefox-78.4.0esr.source.tar.xz) = 335094656
+TIMESTAMP = 1608132330
+SHA256 (firefox-78.6.0esr.source.tar.xz) = 5e69f9bfd1a35decdae8d4b28da8100820e58b429f539fa9884802347631cf53
+SIZE (firefox-78.6.0esr.source.tar.xz) = 338098664
diff --git a/lang/spidermonkey78/files/patch-third__party_rust_cc_.cargo-checksum.json b/lang/spidermonkey78/files/patch-third__party_rust_cc_.cargo-checksum.json
new file mode 100644
index 000000000000..e0cc3144a906
--- /dev/null
+++ b/lang/spidermonkey78/files/patch-third__party_rust_cc_.cargo-checksum.json
@@ -0,0 +1,6 @@
+--- third_party/rust/cc/.cargo-checksum.json.orig	2020-12-08 01:14:48 UTC
++++ third_party/rust/cc/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"4753929dbb7b676c19d7cfa06d0a47e37003554b80c536cbf2b892d591ef61c2","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"}
+\ No newline at end of file
++{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"ba6cf8f55dc05d4ae2ae2dbb46c100abeb12da5dfb354df44ca238951b36ccab","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"}
diff --git a/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs b/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
new file mode 100644
index 000000000000..9c04ba1845c4
--- /dev/null
+++ b/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
@@ -0,0 +1,32 @@
+--- third_party/rust/cc/src/lib.rs.orig	2020-10-14 09:34:53 UTC
++++ third_party/rust/cc/src/lib.rs
+@@ -2344,28 +2344,7 @@ impl Tool {
+     }
+ 
+     fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
+-        // Try to detect family of the tool from its name, falling back to Gnu.
+-        let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
+-            if fname.contains("clang-cl") {
+-                ToolFamily::Msvc { clang_cl: true }
+-            } else if fname.contains("cl")
+-                && !fname.contains("cloudabi")
+-                && !fname.contains("uclibc")
+-                && !fname.contains("clang")
+-            {
+-                ToolFamily::Msvc { clang_cl: false }
+-            } else if fname.contains("clang") {
+-                match clang_driver {
+-                    Some("cl") => ToolFamily::Msvc { clang_cl: true },
+-                    _ => ToolFamily::Clang,
+-                }
+-            } else {
+-                ToolFamily::Gnu
+-            }
+-        } else {
+-            ToolFamily::Gnu
+-        };
+-
++        let family = ToolFamily::Gnu;
+         Tool {
+             path: path,
+             cc_wrapper_path: None,