pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust-beta: update to 1.96.0-beta.5
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Sat May 2 20:10:08 2026 +0200
Changeset: 5a7323e53a43ccc872939561a0543cfd5799282b
Modified Files:
rust-beta/Makefile
rust-beta/cargo.mk
rust-beta/distinfo
Removed Files:
rust-beta/patches/patch-compiler_rustc__llvm_build.rs
rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
Log Message:
rust-beta: update to 1.96.0-beta.5
- Update to beta.5
- Remove, for x86_64, unecessary patches
- Add support for CARGO_GITHUB_CRATES from lang/rust
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5a7323e53a43ccc872939561a0543cfd5799282b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust-beta/Makefile | 30 ----------
rust-beta/cargo.mk | 27 ++++++++-
rust-beta/distinfo | 24 +-------
.../patches/patch-compiler_rustc__llvm_build.rs | 50 ----------------
...28.2+1.1.1w_openssl_Configurations_10-main.conf | 18 ------
...-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c | 18 ------
...h-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs | 67 ----------------------
...0.5.0+3.5.0_openssl_Configurations_10-main.conf | 18 ------
...sl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c | 18 ------
...tch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs | 30 ----------
...0.5.4+3.5.4_openssl_Configurations_10-main.conf | 18 ------
...sl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c | 18 ------
...tch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs | 30 ----------
...endor_openssl-sys-0.9.107_build_find__normal.rs | 30 ----------
.../patch-vendor_openssl-sys-0.9.107_build_main.rs | 23 --------
...endor_openssl-sys-0.9.109_build_find__normal.rs | 30 ----------
.../patch-vendor_openssl-sys-0.9.109_build_main.rs | 23 --------
...endor_openssl-sys-0.9.111_build_find__normal.rs | 30 ----------
.../patch-vendor_openssl-sys-0.9.111_build_main.rs | 23 --------
...vendor_openssl-sys-0.9.92_build_find__normal.rs | 30 ----------
.../patch-vendor_openssl-sys-0.9.92_build_main.rs | 23 --------
21 files changed, 29 insertions(+), 549 deletions(-)
diffs:
diff --git a/rust-beta/Makefile b/rust-beta/Makefile
index 9416f166ef..ab7c5646b0 100644
--- a/rust-beta/Makefile
+++ b/rust-beta/Makefile
@@ -141,36 +141,6 @@ SUBST_FILES.prefix+= src/bootstrap/bootstrap.py
SUBST_VARS.prefix= PREFIX
# Generate list of subst entries for various .cargo-checksum.json files.
-CKSUM_CRATES+= vendor/openssl-src-300.5.0+3.5.0
-CKSUMS+= 16c0b9fa70475cfb50ac21ad4ce049b494c45b3270fed386013785a28abb8d0a
-CKSUMS+= e2817c457afa7efc0f2ca62ce9dab5254eb5ddd9a5fd9e75bba2789be92c7b14
-CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
-CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
-CKSUMS+= ac5501e7bff0f4384db0537307b362bf1bcb120d8b5859e5f08bd796e78feaea
-CKSUMS+= 6d2c2831119e059d35e81a89b08195a29e325f68acfd86a3a7157ebf8e78182d
-
-CKSUM_CRATES+= vendor/openssl-src-300.5.4+3.5.4
-CKSUMS+= 33f1e78110293a8558ae997ed57e7aac72c5bfd47a241dc7f6e2ffa98b7a7137
-CKSUMS+= d0232a8b63c2fb396ed7551eb983b16b6ebafbba4b33d4434e167b05ee290f8f
-
-CKSUM_CRATES+= vendor/openssl-sys-0.9.107
-CKSUMS+= a0d47c624273b43b4250cff5fa2f9b75e4199ca76897608563b526aedcdf3a16
-CKSUMS+= fcfc15ca30e1f881ed46cf57597a72bd2a8307269d0394c905f23e076a983e12
-CKSUMS+= e6d478786035538d721d88b7736f602c965a38687a805cb377ebbe0ea1a14617
-CKSUMS+= e2b2473bdf7ce5f854fcef6f07f984accc53b4382dba160d625c1fcbaba31612
-
-CKSUM_CRATES+= vendor/openssl-sys-0.9.109
-CKSUMS+= 112fcb6f18b81f31c23c60e7be5fddc87603c05a595f2e22b6e8f7ed2ea89e5f
-CKSUMS+= 023a3e755d7d4c5ca6e4f8ce7a8b1dc2dd1e50cbfcaa43cc6fe809b251ee7037
-CKSUMS+= f66ce762ec63c28621a0d6d48bd5872b96e71f0bfb6f88576a6e2cba0c229e12
-CKSUMS+= 656834a8bd87476b074f36bcc2aeb33a74a0a0a6db5d140c35c4b3eb385afebe
-
-CKSUM_CRATES+= vendor/openssl-sys-0.9.111
-CKSUMS+= 0c5a4bd38ed007182cfec3cf0824a4806e5c629b9d69e3cc2a5b6e9be3eec280
-CKSUMS+= 777a22f3cd39ad01f2e559ecf600bb9c03ec42e0b9fbe41746f42938e162d523
-CKSUMS+= d17fa8715a43ff0da872ac504abb2cc0a395644e8f5c8c128812758c458d5963
-CKSUMS+= 02d5de4e4976450f8e665e0eff664e93063dd53aec2cb75ecee0847e3c0c086e
-
CKSUM_CRATES+= vendor/libc-0.2.155
CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
diff --git a/rust-beta/cargo.mk b/rust-beta/cargo.mk
index 771d88cb22..89e71e6a23 100644
--- a/rust-beta/cargo.mk
+++ b/rust-beta/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: cargo.mk,v 1.45 2026/04/26 21:00:57 wiz Exp $
#
# Common logic that can be used by packages that depend on cargo crates
# from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -18,6 +18,18 @@
# make print-cargo-depends > cargo-depends.mk
#
# See also www/geckodriver for a full example.
+#
+# Some dependencies are pulled in from git repositories directly (not
+# using crates.io). You can define CARGO_GITHUB_CRATES for
+# those. Every entry in CARGO_GITHUB_CRATES consists of three parts
+# ("user", "name", "hash") separated by spaces, where "user" is the
+# github user account (first part of the github URL), "name" is the
+# github project name (second part of the github URL) and "hash" is
+# the git revision to fetch. For example:
+#
+# CARGO_GITHUB_CRATES= foo bar 12345
+#
+# will fetch https://github.com/foo/bar/ revision 12345
MASTER_SITES?= -${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
@@ -31,6 +43,19 @@ CARGO_WRKSRC?= ${WRKSRC}
# TODO: some Cargo.lock files include git+https sources which need to be fetched from the URL (not necessarily resolving to a crate.io url)
DISTFILES?= ${DEFAULT_DISTFILES}
+
+.if defined(CARGO_GITHUB_CRATES)
+SUBST_CLASSES+= gitcrate
+SUBST_FILES.gitcrate+= Cargo.toml
+SUBST_MESSAGE.gitcrate= Replacing github crate path with local path.
+SUBST_STAGE.gitcrate= pre-configure
+. for user name hash in ${CARGO_GITHUB_CRATES}
+DISTFILES+= ${name}-${hash}.tar.gz
+SITES.${name}-${hash}.tar.gz+= -${MASTER_SITE_GITHUB:=${user}/}${name}/archive/${hash}.tar.gz
+SUBST_SED.gitcrate+= -E -e 's!git.*github.com/${user}/${name}.*${hash}(.),!path = \1../${name}-${hash}\1,!'
+. endfor
+.endif
+
.for crate in ${CARGO_CRATE_DEPENDS}
DISTFILES+= ${crate}.crate
. if ${crate:M*+*}
diff --git a/rust-beta/distinfo b/rust-beta/distinfo
index 9653f81d44..75bf38109b 100644
--- a/rust-beta/distinfo
+++ b/rust-beta/distinfo
@@ -6,10 +6,9 @@ Size (rust-1.95.0-x86_64-unknown-netbsd.tar.xz) = 229565964 bytes
BLAKE2s (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = 350d3caee31d727425cef73e4075ef04548ad9de1df7f47bdf44d15bc469b197
SHA512 (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = b6260458fbe1c7564f93e0da2ced6f5955771598568e20a9912444792fae096518a964c64a6bb6ad6ebb2029e49544d7422d42c8a2b0866dc0e6d50dcaa6fda4
Size (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = 27125360 bytes
-BLAKE2s (rustc-beta-src.tar.xz) = 9876410edd6153880c76b27cb72fb58c47d0022ae7f3c96f63a6eab2abbbf126
-SHA512 (rustc-beta-src.tar.xz) = cde19450a020e458c2a4fec4a6147ae1bc193e1356e60842576f6a375c6ef40d44b6d7374c6b6119b67157b2a595dc4b3a474ca7e2eb45f27f4dbf0816e50a35
-Size (rustc-beta-src.tar.xz) = 241386820 bytes
-SHA1 (patch-compiler_rustc__llvm_build.rs) = 3acef995e3038a98b29b31b9bdd43286b1ac29f7
+BLAKE2s (rustc-beta-src.tar.xz) = 411c33df04c33308bf771334abbe8fd54e4c8aa89c90a98feb5483c74575f7dd
+SHA512 (rustc-beta-src.tar.xz) = 8c5f5ba5566c8d0521d34f81970ff5f0bdba8f7b3f92e0de3bb8908e6ee957d979809800df1db35b62148ce9ff1cba57331de4b943142f564892b0d154c3455d
+Size (rustc-beta-src.tar.xz) = 241354816 bytes
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee76da9bb768f5b3d9
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 8b18e1dbde59f3e8f20e93c7669618b2c7a13294
SHA1 (patch-src_bootstrap_bootstrap.py) = fb89adaaf01f558d636734db5d778af4a3c67fd6
@@ -22,20 +21,3 @@ SHA1 (patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 36d927a
SHA1 (patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c5cd529719daee44aead47ffd97e682ca9d9a1ae
SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 02c4efefbf1e9e1bd98eb9524515677250ae7454
SHA1 (patch-vendor_lzma-sys-0.1.20_config.h) = 4849052ddb2f04f539fd7060fc1b43cc3acf99c4
-SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf) = 8fc746574f16cd3294edce99beffc3e8c03a089b
-SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c) = 1373d2e4ab609956e0e51ca3d900861caf3ee70d
-SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs) = c3260bfdd670c31845189fcb6b4ed19385a03b2a
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf) = 49803c889864dbeccba92095b9fa6f104ff0180a
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c) = 895b5f4d80fb714973f6d6fb1a39d89907e4976d
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs) = 98e99556c19c055f696f0d9bfbce4aaf207b1640
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf) = cf8ea96ca5e47d8b236e7de9d766badcda7494aa
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c) = 3d3c52cad4faa7af77513eaab26b45ebfbcde906
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs) = 69420384e4716666011bd2c183aa1dc282f24d85
-SHA1 (patch-vendor_openssl-sys-0.9.107_build_find__normal.rs) = b3de2b9137882e3612291057c1b7793a27de760f
-SHA1 (patch-vendor_openssl-sys-0.9.107_build_main.rs) = 46627c013821166688d16d97f6f8ff4ccb552241
-SHA1 (patch-vendor_openssl-sys-0.9.109_build_find__normal.rs) = 96b7b6067e857ef1ef4c8b832dcbe13496e21ca4
-SHA1 (patch-vendor_openssl-sys-0.9.109_build_main.rs) = bc892cf8e13b6b8c6e30804fa41696bcedbabde3
-SHA1 (patch-vendor_openssl-sys-0.9.111_build_find__normal.rs) = 7548f8ef9ae7e1771035814398d72bec867e59a7
-SHA1 (patch-vendor_openssl-sys-0.9.111_build_main.rs) = 87e4f6c55eaf88ebbc81ff927991d013bfca5a38
-SHA1 (patch-vendor_openssl-sys-0.9.92_build_find__normal.rs) = 0ed143b603eea7c0bddf39e97916608c58978202
-SHA1 (patch-vendor_openssl-sys-0.9.92_build_main.rs) = 842ad74284518fbe8ff65222f7f6f81fb6381e49
diff --git a/rust-beta/patches/patch-compiler_rustc__llvm_build.rs b/rust-beta/patches/patch-compiler_rustc__llvm_build.rs
deleted file mode 100644
index 096133453c..0000000000
--- a/rust-beta/patches/patch-compiler_rustc__llvm_build.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.20 2025/08/25 17:51:12 wiz Exp $
-
-Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
-
-Pick up -latomic tweak from
-https://github.com/rust-lang/rust/issues/104220
-and
-https://github.com/rust-lang/rust/pull/104572
-
---- compiler/rustc_llvm/build.rs.orig 2023-10-03 02:52:17.000000000 +0000
-+++ compiler/rustc_llvm/build.rs
-@@ -249,6 +249,10 @@ fn main() {
- {
- // 32-bit targets need to link libatomic.
- println!("cargo:rustc-link-lib=atomic");
-+ if target.contains("netbsd")
-+ {
-+ println!("cargo:rustc-link-lib=z");
-+ }
- } else if target.contains("windows-gnu") {
- println!("cargo:rustc-link-lib=shell32");
- println!("cargo:rustc-link-lib=uuid");
-@@ -261,7 +265,11 @@ fn main() {
- // On NetBSD/i386, gcc and g++ is built for i486 (to maximize backward compat)
- // However, LLVM insists on using 64-bit atomics.
- // This gives rise to a need to link rust itself with -latomic for these targets
-- if target.starts_with("i586") || target.starts_with("i686") {
-+ if target.starts_with("i386")
-+ || target.starts_with("i486")
-+ || target.starts_with("i586")
-+ || target.starts_with("i686")
-+ {
- println!("cargo:rustc-link-lib=atomic");
- }
- println!("cargo:rustc-link-lib=z");
-@@ -352,7 +360,13 @@ fn main() {
- "c++"
- } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
- // NetBSD uses a separate library when relocation is required
-- "stdc++_p"
-+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
-+ "c++_pic"
-+ } else {
-+ "stdc++_pic"
-+ }
-+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
-+ "c++"
- } else if llvm_use_libcxx.is_some() {
- "c++"
- } else {
diff --git a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf b/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
deleted file mode 100644
index 73143bcc7b..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf,v 1.4 2025/10/18 17:14:36 he Exp $
-
-Replicate part of
-https://github.com/openssl/openssl/pull/15086
-
---- vendor/openssl-src-111.28.2+1.1.1w/openssl/Configurations/10-main.conf.orig 2025-05-18 13:23:47.013841572 +0000
-+++ vendor/openssl-src-111.28.2+1.1.1w/openssl/Configurations/10-main.conf
-@@ -943,6 +943,10 @@ my %targets = (
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
- },
-+ "NetBSD-generic32" => {
-+ inherit_from => [ "BSD-generic32" ],
-+ ex_libs => add(threads("-latomic")),
-+ },
- "BSD-generic64" => {
- inherit_from => [ "BSD-generic32" ],
- bn_ops => "SIXTY_FOUR_BIT_LONG",
diff --git a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c b/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
deleted file mode 100644
index 9f96455bcb..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c,v 1.1 2025/10/18 17:14:36 he Exp $
-
-Make this build if bswap32 is already defined, as for NetBSD/i586.
-
---- vendor/openssl-src-111.28.2+1.1.1w/openssl/crypto/aria/aria.c.orig 2025-05-19 20:01:02.477323075 +0000
-+++ vendor/openssl-src-111.28.2+1.1.1w/openssl/crypto/aria/aria.c
-@@ -32,9 +32,11 @@
- #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
- #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
-
-+#ifndef bswap32
- #define bswap32(v) \
- (((v) << 24) ^ ((v) >> 24) ^ \
- (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
-+#endif
-
- #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
- #define GET_U32_BE(X, Y) ( \
diff --git a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs b/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
deleted file mode 100644
index 278b50f295..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs,v 1.5 2026/04/02 19:06:35 wiz Exp $
-
-Add the various NetBSD targets.
-
---- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
-@@ -239,6 +239,8 @@ impl Build {
- "aarch64-unknown-freebsd" => "BSD-generic64",
- "aarch64-unknown-linux-gnu" => "linux-aarch64",
- "aarch64-unknown-linux-musl" => "linux-aarch64",
-+ "aarch64-unknown-netbsd" => "BSD-generic64",
-+ "aarch64_be-unknown-netbsd" => "BSD-generic64",
- "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
- "arm-linux-androideabi" => "linux-armv4",
- "armv7-linux-androideabi" => "linux-armv4",
-@@ -249,14 +251,17 @@ impl Build {
- "armv5te-unknown-linux-gnueabi" => "linux-armv4",
- "armv5te-unknown-linux-musleabi" => "linux-armv4",
- "armv6-unknown-freebsd" => "BSD-generic32",
-+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
- "armv7-unknown-freebsd" => "BSD-generic32",
- "armv7-unknown-linux-gnueabi" => "linux-armv4",
- "armv7-unknown-linux-musleabi" => "linux-armv4",
- "armv7-unknown-linux-gnueabihf" => "linux-armv4",
- "armv7-unknown-linux-musleabihf" => "linux-armv4",
-+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
- "asmjs-unknown-emscripten" => "gcc",
- "i586-unknown-linux-gnu" => "linux-elf",
- "i586-unknown-linux-musl" => "linux-elf",
-+ "i586-unknown-netbsd" => "BSD-x86-elf",
- "i686-apple-darwin" => "darwin-i386-cc",
- "i686-linux-android" => "linux-elf",
- "i686-pc-windows-gnu" => "mingw",
-@@ -264,8 +269,10 @@ impl Build {
- "i686-unknown-freebsd" => "BSD-x86-elf",
- "i686-unknown-linux-gnu" => "linux-elf",
- "i686-unknown-linux-musl" => "linux-elf",
-+ "i686-unknown-netbsd" => "BSD-x86-elf",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => NetBSD-generic32,
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -274,9 +281,11 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "mipsel-unknown-netbsd" => "NetBSD-generic32",
- "powerpc-unknown-freebsd" => "BSD-generic32",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc-unknown-linux-gnuspe" => "linux-ppc",
-+ "powerpc-unknown-netbsd" => "NetBSD-generic32",
- "powerpc64-unknown-freebsd" => "BSD-generic64",
- "powerpc64-unknown-linux-gnu" => "linux-ppc64",
- "powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -284,8 +293,10 @@ impl Build {
- "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
- "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
- "riscv64gc-unknown-linux-gnu" => "linux-generic64",
-+ "riscv64gc-unknown-netbsd" => "BSD-generic64",
- "s390x-unknown-linux-gnu" => "linux64-s390x",
- "s390x-unknown-linux-musl" => "linux64-s390x",
-+ "sparc64-unknown-netbsd" => "BSD-generic64",
- "x86_64-apple-darwin" => "darwin64-x86_64-cc",
- "x86_64-linux-android" => "linux-x86_64",
- "x86_64-pc-windows-gnu" => "mingw64",
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf b/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
deleted file mode 100644
index 8b8658489d..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf,v 1.1 2025/10/18 17:14:36 he Exp $
-
-Replicate part of
-https://github.com/openssl/openssl/pull/15086
-
---- vendor/openssl-src-300.5.0+3.5.0/openssl/Configurations/10-main.conf.orig 2025-05-20 09:03:49.120083364 +0000
-+++ vendor/openssl-src-300.5.0+3.5.0/openssl/Configurations/10-main.conf
-@@ -1033,6 +1033,10 @@ my %targets = (
- shared_target => "bsd-gcc-shared",
- shared_cflag => "-fPIC",
- },
-+ "NetBSD-generic32" => {
-+ inherit_from => [ "BSD-generic32" ],
-+ ex_libs => add(threads("-latomic")),
-+ },
- "BSD-generic64" => {
- inherit_from => [ "BSD-generic32" ],
- bn_ops => "SIXTY_FOUR_BIT_LONG",
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c b/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
deleted file mode 100644
index 77c8b0f3e0..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c,v 1.1 2025/10/18 17:14:36 he Exp $
-
-Make this build also if bswap32 is already defined, as for NetBSD/i586.
-
---- vendor/openssl-src-300.5.0+3.5.0/openssl/crypto/aria/aria.c.orig 2025-05-19 20:04:00.808387729 +0000
-+++ vendor/openssl-src-300.5.0+3.5.0/openssl/crypto/aria/aria.c
-@@ -32,9 +32,11 @@
- #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
- #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
-
-+#ifndef bswap32
- #define bswap32(v) \
- (((v) << 24) ^ ((v) >> 24) ^ \
- (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
-+#endif
-
- #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
- #define GET_U32_BE(X, Y) ( \
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs b/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
deleted file mode 100644
index 11a1eaf2db..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs,v 1.2 2026/04/02 19:06:35 wiz Exp $
-
-Make this build on NetBSD for arm6, mipsel and m68k as well.
-
---- vendor/openssl-src-300.5.0+3.5.0/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-300.5.0+3.5.0/src/lib.rs
-@@ -321,6 +321,7 @@ impl Build {
- "armv5te-unknown-linux-gnueabi" => "linux-armv4",
- "armv5te-unknown-linux-musleabi" => "linux-armv4",
- "armv6-unknown-freebsd" => "BSD-generic32",
-+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
- "armv6-alpine-linux-musleabihf" => "linux-armv6",
- "armv7-unknown-freebsd" => "BSD-armv4",
- "armv7-unknown-linux-gnueabi" => "linux-armv4",
-@@ -348,6 +349,7 @@ impl Build {
- "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => "NetBSD-generic32",
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -356,6 +358,7 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "mipsel-unknown-netbsd" => "NetBSD-generic32",
- "powerpc-unknown-freebsd" => "BSD-ppc",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc-unknown-linux-gnuspe" => "linux-ppc",
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf b/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
deleted file mode 100644
index 7106eca190..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf,v 1.1 2026/04/02 19:06:35 wiz Exp $
-
-Replicate part of
-https://github.com/openssl/openssl/pull/15086
-
---- vendor/openssl-src-300.5.4+3.5.4/openssl/Configurations/10-main.conf.orig 2025-11-02 17:12:27.865420544 +0000
-+++ vendor/openssl-src-300.5.4+3.5.4/openssl/Configurations/10-main.conf
-@@ -1033,6 +1033,10 @@ my %targets = (
- shared_target => "bsd-gcc-shared",
- shared_cflag => "-fPIC",
- },
-+ "NetBSD-generic32" => {
-+ inherit_from => [ "BSD-generic32" ],
-+ ex_libs => add(threads("-latomic")),
-+ },
- "BSD-generic64" => {
- inherit_from => [ "BSD-generic32" ],
- bn_ops => "SIXTY_FOUR_BIT_LONG",
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c b/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
deleted file mode 100644
index e404768278..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c,v 1.1 2026/04/02 19:06:35 wiz Exp $
-
-Make this build also if bswap32 is already defined, as for NetBSD/i586.
-
---- vendor/openssl-src-300.5.4+3.5.4/openssl/crypto/aria/aria.c.orig 2025-11-02 17:14:42.569500518 +0000
-+++ vendor/openssl-src-300.5.4+3.5.4/openssl/crypto/aria/aria.c
-@@ -32,9 +32,11 @@
- #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
- #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
-
-+#ifndef bswap32
- #define bswap32(v) \
- (((v) << 24) ^ ((v) >> 24) ^ \
- (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
-+#endif
-
- #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
- #define GET_U32_BE(X, Y) ( \
diff --git a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs b/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
deleted file mode 100644
index 18315cd251..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
-
-Make this build on NetBSD for armv6, mipsel and m68k as well.
-
---- vendor/openssl-src-300.5.4+3.5.4/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-300.5.4+3.5.4/src/lib.rs
-@@ -326,6 +326,7 @@ impl Build {
- "armv5te-unknown-linux-gnueabi" => "linux-armv4",
- "armv5te-unknown-linux-musleabi" => "linux-armv4",
- "armv6-unknown-freebsd" => "BSD-generic32",
-+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
- "armv6-alpine-linux-musleabihf" => "linux-armv6",
- "armv7-unknown-freebsd" => "BSD-armv4",
- "armv7-unknown-linux-gnueabi" => "linux-armv4",
-@@ -353,6 +354,7 @@ impl Build {
- "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => "NetBSD-generic32",
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -361,6 +363,7 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "mipsel-unknown-netbsd" => "NetBSD-generic32",
- "powerpc-unknown-freebsd" => "BSD-ppc",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc-unknown-linux-gnuspe" => "linux-ppc",
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
deleted file mode 100644
index ec68e07374..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.107_build_find__normal.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
-
-Add hack for Darwin when homebrew is installed.
-
---- vendor/openssl-sys-0.9.107/build/find_normal.rs.orig 2025-06-28 08:24:16.945712755 +0000
-+++ vendor/openssl-sys-0.9.107/build/find_normal.rs
-@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
- fn find_openssl_dir(target: &str) -> OsString {
- let host = env::var("HOST").unwrap();
-
-- if host == target && target.ends_with("-apple-darwin") {
-- let homebrew_dir = match target {
-- "aarch64-apple-darwin" => "/opt/homebrew",
-- _ => "/usr/local",
-- };
--
-- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
-- // pkgsrc
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
-- // MacPorts
-- return dir.into();
-- }
-- }
--
- try_pkg_config();
- try_vcpkg();
-
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
deleted file mode 100644
index 1af0475acb..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.107_build_main.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
-
-Patterned after Linux and Android, on 32-bit NetBSD ports
-include -latomic. Parts of this inspired by
-https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
-
---- vendor/openssl-sys-0.9.107/build/main.rs.orig 2025-06-28 08:26:57.774420907 +0000
-+++ vendor/openssl-sys-0.9.107/build/main.rs
-@@ -269,6 +269,14 @@ fn main() {
- println!("cargo:rustc-link-lib=atomic");
- }
-
-+ // Patterned of the above, make sure we include -latomic
-+ // on ilp32 NetBSD ports (yes, this only tests the "p32" part).
-+ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
-+ {
-+ println!("cargo:rustc-link-lib=atomic");
-+ }
-+
- if kind == "static" && target.contains("windows") {
- println!("cargo:rustc-link-lib=dylib=gdi32");
- println!("cargo:rustc-link-lib=dylib=user32");
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
deleted file mode 100644
index ae3496cdbc..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.109_build_find__normal.rs,v 1.1 2025/10/18 17:14:36 he Exp $
-
-Add hack for Darwin when homebrew is installed.
-
---- vendor/openssl-sys-0.9.109/build/find_normal.rs.orig 2025-06-28 08:28:59.789478187 +0000
-+++ vendor/openssl-sys-0.9.109/build/find_normal.rs
-@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
- fn find_openssl_dir(target: &str) -> OsString {
- let host = env::var("HOST").unwrap();
-
-- if host == target && target.ends_with("-apple-darwin") {
-- let homebrew_dir = match target {
-- "aarch64-apple-darwin" => "/opt/homebrew",
-- _ => "/usr/local",
-- };
--
-- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
-- // pkgsrc
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
-- // MacPorts
-- return dir.into();
-- }
-- }
--
- try_pkg_config();
- try_vcpkg();
-
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
deleted file mode 100644
index 1ac33e4b86..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.109_build_main.rs,v 1.1 2025/10/18 17:14:36 he Exp $
-
-Patterned after Linux and Android, on 32-bit NetBSD ports
-include -latomic. Parts of this inspired by
-https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
-
---- vendor/openssl-sys-0.9.109/build/main.rs.orig 2025-06-28 08:30:05.194163693 +0000
-+++ vendor/openssl-sys-0.9.109/build/main.rs
-@@ -269,6 +269,14 @@ fn main() {
- println!("cargo:rustc-link-lib=atomic");
- }
-
-+ // Patterned of the above, make sure we include -latomic
-+ // on ilp32 ports (yes, this only tests the "p32" part).
-+ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
-+ {
-+ println!("cargo:rustc-link-lib=atomic");
-+ }
-+
- if kind == "static" && target.contains("windows") {
- println!("cargo:rustc-link-lib=dylib=gdi32");
- println!("cargo:rustc-link-lib=dylib=user32");
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
deleted file mode 100644
index c6257491a1..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.111_build_find__normal.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
-
-Add hack for Darwin when homebrew is installed.
-
---- vendor/openssl-sys-0.9.111/build/find_normal.rs.orig 2026-01-25 08:56:08.257782732 +0000
-+++ vendor/openssl-sys-0.9.111/build/find_normal.rs
-@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
- fn find_openssl_dir(target: &str) -> OsString {
- let host = env::var("HOST").unwrap();
-
-- if host == target && target.ends_with("-apple-darwin") {
-- let homebrew_dir = match target {
-- "aarch64-apple-darwin" => "/opt/homebrew",
-- _ => "/usr/local",
-- };
--
-- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
-- // pkgsrc
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
-- // MacPorts
-- return dir.into();
-- }
-- }
--
- try_pkg_config();
- try_vcpkg();
-
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
deleted file mode 100644
index 0567c8f980..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.111_build_main.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
-
-Patterned after Linux and Android, on 32-bit NetBSD ports
-include -latomic. Parts of this inspired by
-https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
-
---- vendor/openssl-sys-0.9.111/build/main.rs.orig 2026-01-25 08:57:28.677889187 +0000
-+++ vendor/openssl-sys-0.9.111/build/main.rs
-@@ -279,6 +279,14 @@ fn main() {
- println!("cargo:rustc-link-lib=atomic");
- }
-
-+ // Patterned of the above, make sure we include -latomic
-+ // on ilp32 ports (yes, this only tests the "p32" part).
-+ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
-+ {
-+ println!("cargo:rustc-link-lib=atomic");
-+ }
-+
- if kind == "static" && target.contains("windows") {
- println!("cargo:rustc-link-lib=dylib=gdi32");
- println!("cargo:rustc-link-lib=dylib=user32");
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
deleted file mode 100644
index eadb21f4b0..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.92_build_find__normal.rs,v 1.4 2025/10/18 17:14:36 he Exp $
-
-Add hack for Darwin when homebrew is installed.
-
---- vendor/openssl-sys-0.9.92/build/find_normal.rs.orig 2025-09-19 21:56:18.930723780 +0000
-+++ vendor/openssl-sys-0.9.92/build/find_normal.rs
-@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
- fn find_openssl_dir(target: &str) -> OsString {
- let host = env::var("HOST").unwrap();
-
-- if host == target && target.ends_with("-apple-darwin") {
-- let homebrew_dir = match target {
-- "aarch64-apple-darwin" => "/opt/homebrew",
-- _ => "/usr/local",
-- };
--
-- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
-- // pkgsrc
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
-- // MacPorts
-- return dir.into();
-- }
-- }
--
- try_pkg_config();
- try_vcpkg();
-
diff --git a/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs b/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
deleted file mode 100644
index 09c1b546a4..0000000000
--- a/rust-beta/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-vendor_openssl-sys-0.9.92_build_main.rs,v 1.4 2025/10/18 17:14:37 he Exp $
-
-Patterned after Linux and Android, on 32-bit NetBSD ports
-include -latomic. Parts of this inspired by
-https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
-
---- vendor/openssl-sys-0.9.92/build/main.rs.orig 2025-09-19 21:57:47.732695298 +0000
-+++ vendor/openssl-sys-0.9.92/build/main.rs
-@@ -115,6 +115,14 @@ fn main() {
- println!("cargo:rustc-link-lib={}={}", kind, lib);
- }
-
-+ // Patterned of the above, make sure we include -latomic
-+ // on NetBSD ilp32 ports (yes, this only tests the "p32" part).
-+ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
-+ {
-+ println!("cargo:rustc-link-lib=atomic");
-+ }
-+
- if kind == "static" && target.contains("windows") {
- println!("cargo:rustc-link-lib=dylib=gdi32");
- println!("cargo:rustc-link-lib=dylib=user32");
Home |
Main Index |
Thread Index |
Old Index