From b2893d205d13ff9434290b3cf67e467095b3a9e7 Mon Sep 17 00:00:00 2001 From: jca Date: Wed, 4 Jan 2023 12:05:19 +0000 Subject: [PATCH] lang/rust now supports a single target on riscv64, drop patch ok ajacoutot@ (maintainer) --- .../patch-build_moz_configure_rust_configure | 17 ----------------- .../patch-third_party_rust_cc_src_lib_rs | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 devel/spidermonkey102/patches/patch-build_moz_configure_rust_configure diff --git a/devel/spidermonkey102/patches/patch-build_moz_configure_rust_configure b/devel/spidermonkey102/patches/patch-build_moz_configure_rust_configure deleted file mode 100644 index e65c1624384..00000000000 --- a/devel/spidermonkey102/patches/patch-build_moz_configure_rust_configure +++ /dev/null @@ -1,17 +0,0 @@ -Index: build/moz.configure/rust.configure ---- build/moz.configure/rust.configure.orig -+++ build/moz.configure/rust.configure -@@ -394,6 +394,13 @@ def detect_rustc_target( - if len(narrowed) == 1: - return narrowed[0].rust_target - -+ # Temporary workaround for riscv64: the official rust target name is -+ # riscv64gc-unknown-openbsd but our port also supports -+ # riscv64-unknown-openbsd as an alias, so the narrowed list on riscv64 -+ # contains two entries. Just pick the first one. -+ if len(narrowed) >= 1: -+ return narrowed[0].rust_target -+ - return None - - rustc_target = find_candidate(candidates) diff --git a/devel/spidermonkey102/patches/patch-third_party_rust_cc_src_lib_rs b/devel/spidermonkey102/patches/patch-third_party_rust_cc_src_lib_rs index 8abf00ce17e..6215bb7c718 100644 --- a/devel/spidermonkey102/patches/patch-third_party_rust_cc_src_lib_rs +++ b/devel/spidermonkey102/patches/patch-third_party_rust_cc_src_lib_rs @@ -1,4 +1,4 @@ -Support riscv64-unknown-openbsd +Support riscv64gc-unknown-openbsd Index: third_party/rust/cc/src/lib.rs --- third_party/rust/cc/src/lib.rs.orig