pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust195: reduce diffs to lang/rust
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu May 7 14:07:57 2026 +0200
Changeset: 83078f401fd7163cc9579c974a17bc344b38d3a5
Modified Files:
rust195/Makefile
rust195/buildlink3.mk
rust195/cargo.mk
rust195/cross.mk
rust195/do-cross.mk
rust195/options.mk
rust195/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
rust195/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
rust195/patches/patch-compiler_rustc__target_src_spec_mod.rs
rust195/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
rust195/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
rust195/patches/patch-src_bootstrap_src_core_build__steps_install.rs
rust195/patches/patch-src_tools_rust-installer_install-template.sh
rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust195/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
rust195/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
rust195/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
rust195/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
rust195/rust.mk
Log Message:
rust195: reduce diffs to lang/rust
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=83078f401fd7163cc9579c974a17bc344b38d3a5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust195/Makefile | 1 +
rust195/buildlink3.mk | 2 +-
rust195/cargo.mk | 27 +++++++++++++++++++++-
rust195/cross.mk | 2 +-
rust195/do-cross.mk | 2 +-
rust195/options.mk | 2 +-
...compiler_rustc__codegen__ssa_src_back_linker.rs | 2 +-
...-compiler_rustc__target_src_spec_base_netbsd.rs | 2 +-
.../patch-compiler_rustc__target_src_spec_mod.rs | 2 +-
...arget_src_spec_targets_m68k__unknown__netbsd.rs | 2 +-
...t_src_spec_targets_mips64el__unknown__netbsd.rs | 2 +-
...-src_bootstrap_src_core_build__steps_install.rs | 2 +-
...ch-src_tools_rust-installer_install-template.sh | 2 +-
...c-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 +-
...2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 2 +-
...-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs | 2 +-
...c-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 +-
...2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 2 +-
...-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs | 2 +-
...c-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 +-
...2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 2 +-
...h-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs | 2 +-
...tch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs | 2 +-
...0.5.4+3.5.4_openssl_Configurations_10-main.conf | 2 +-
...sl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c | 2 +-
...tch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs | 2 +-
...endor_openssl-sys-0.9.111_build_find__normal.rs | 2 +-
.../patch-vendor_openssl-sys-0.9.111_build_main.rs | 2 +-
rust195/rust.mk | 6 ++++-
29 files changed, 58 insertions(+), 28 deletions(-)
diffs:
diff --git a/rust195/Makefile b/rust195/Makefile
index f9453507fb..63a028fb9b 100644
--- a/rust195/Makefile
+++ b/rust195/Makefile
@@ -79,6 +79,7 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
MAKE_ENV.SunOS+= AR=gar
+MAKE_ENV.SunOS+= BOOTSTRAP_SKIP_TARGET_SANITY=1
# Debugging of crate resolution
# Annoyingly, this makes the powerpc build succeed...
diff --git a/rust195/buildlink3.mk b/rust195/buildlink3.mk
index dba88f49fb..485765e95e 100644
--- a/rust195/buildlink3.mk
+++ b/rust195/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2025/07/24 10:33:38 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2026/04/02 19:06:34 wiz Exp $
BUILDLINK_TREE+= rust
diff --git a/rust195/cargo.mk b/rust195/cargo.mk
index c5bade5b1a..05cdf7b4c6 100644
--- a/rust195/cargo.mk
+++ b/rust195/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.44 2025/08/25 17:51:11 wiz Exp $
+# $NetBSD: cargo.mk,v 1.46 2026/05/03 13:55:03 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/rust195/cross.mk b/rust195/cross.mk
index db485880d7..3ccdc3e35b 100644
--- a/rust195/cross.mk
+++ b/rust195/cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.15 2025/08/25 17:51:11 wiz Exp $
+# $NetBSD: cross.mk,v 1.16 2026/04/02 19:06:34 wiz Exp $
# These settings may be used to cross-build rust.
#
diff --git a/rust195/do-cross.mk b/rust195/do-cross.mk
index 7123e8835e..6e5ad44c6b 100644
--- a/rust195/do-cross.mk
+++ b/rust195/do-cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: do-cross.mk,v 1.17 2026/04/02 19:06:34 wiz Exp $
# Do all the NetBSD cross builds
# Collect the bootstrap kits in dist/
diff --git a/rust195/options.mk b/rust195/options.mk
index 66cd13d04a..8ba5ffc883 100644
--- a/rust195/options.mk
+++ b/rust195/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.49 2025/08/25 17:51:11 wiz Exp $
+# $NetBSD: options.mk,v 1.54 2026/04/02 19:06:34 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
diff --git a/rust195/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/rust195/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
index 8fd4710a16..871c27f06e 100644
--- a/rust195/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ b/rust195/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.22 2026/04/02 19:06:34 wiz Exp $
Do not use @rpath on Darwin.
Find external libunwind on Linux.
diff --git a/rust195/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs b/rust195/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
index 90f4b467c7..122dcf7de6 100644
--- a/rust195/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
+++ b/rust195/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_base_netbsd.rs,v 1.7 2026/04/02 19:06:34 wiz Exp $
For the benefit of powerpc, when libatomic-links is installed,
search the directory containing the symlinks to -latomic.
diff --git a/rust195/patches/patch-compiler_rustc__target_src_spec_mod.rs b/rust195/patches/patch-compiler_rustc__target_src_spec_mod.rs
index d30e2b6c6c..378fa5544a 100644
--- a/rust195/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/rust195/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.18 2026/04/02 19:06:34 wiz Exp $
Add entry for NetBSD/mips64el and NetBSD/m68k
diff --git a/rust195/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs b/rust195/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
index 8ade8f5369..24bb5d0979 100644
--- a/rust195/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
+++ b/rust195/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Add a target description for NetBSD/m68k.
diff --git a/rust195/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs b/rust195/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
index 18383b7a1d..9da8fd6fe1 100644
--- a/rust195/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
+++ b/rust195/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs,v 1.8 2026/04/02 19:06:34 wiz Exp $
Provide a mips64el target with N32, suitable for NetBSD/mips64el.
diff --git a/rust195/patches/patch-src_bootstrap_src_core_build__steps_install.rs b/rust195/patches/patch-src_bootstrap_src_core_build__steps_install.rs
index 4795ca123b..2b14fb1b9e 100644
--- a/rust195/patches/patch-src_bootstrap_src_core_build__steps_install.rs
+++ b/rust195/patches/patch-src_bootstrap_src_core_build__steps_install.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_bootstrap_src_core_build__steps_install.rs,v 1.5 2026/04/02 19:06:34 wiz Exp $
Drop "docs" from installation (takes forever), add "rust".
diff --git a/rust195/patches/patch-src_tools_rust-installer_install-template.sh b/rust195/patches/patch-src_tools_rust-installer_install-template.sh
index 9518c03bc4..2cbfd02690 100644
--- a/rust195/patches/patch-src_tools_rust-installer_install-template.sh
+++ b/rust195/patches/patch-src_tools_rust-installer_install-template.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.14 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.15 2026/04/02 19:06:34 wiz Exp $
No logging to 'install.log'.
Do not create 'uninstall.sh'.
diff --git a/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 4b32e88f6d..693a9443e8 100644
--- a/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
isn't universally this type on the various NetBSD targets.
diff --git a/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index a0eb64778f..986f0dc42c 100644
--- a/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.2 2026/04/02 19:06:34 wiz Exp $
Unbreak this module.
diff --git a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
index e7f19ecf34..ec9782f6c8 100644
--- a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Add cpu-specific file for m68k on NetBSD.
diff --git a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 51b50ed4eb..a73e4e1ab1 100644
--- a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
isn't universally this type on the various NetBSD targets.
diff --git a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 05c0d14ca1..6de8bf2df5 100644
--- a/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Unbreak this module.
diff --git a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
index 03696c65f2..2408a54e10 100644
--- a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
Add cpu-specific file for m68k on NetBSD.
diff --git a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 21bd0ba766..1e7822cd8c 100644
--- a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
Add m68k target.
diff --git a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 3abe50a738..2a8857346f 100644
--- a/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust195/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
Unbreak this module.
These changes have been submitted upstream, but apparently not
diff --git a/rust195/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs b/rust195/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
index f7abd5d7d0..278b50f295 100644
--- a/rust195/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
+++ b/rust195/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$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.
diff --git a/rust195/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs b/rust195/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
index 3851054519..11a1eaf2db 100644
--- a/rust195/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
+++ b/rust195/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$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.
diff --git a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
index c826efe847..7106eca190 100644
--- a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
+++ b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
@@ -1,4 +1,4 @@
-$NetBSD$
+$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
diff --git a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
index 5f134efcf4..e404768278 100644
--- a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
+++ b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$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.
diff --git a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
index 2a9ec06917..18315cd251 100644
--- a/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
+++ b/rust195/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$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.
diff --git a/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs b/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
index 96a2d0e1ba..c6257491a1 100644
--- a/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
+++ b/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$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.
diff --git a/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs b/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
index fa70956e3f..0567c8f980 100644
--- a/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
+++ b/rust195/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$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
diff --git a/rust195/rust.mk b/rust195/rust.mk
index d62490efb2..5903baec65 100644
--- a/rust195/rust.mk
+++ b/rust195/rust.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rust.mk,v 1.18 2026/03/04 12:17:34 jperkin Exp $
+# $NetBSD: rust.mk,v 1.20 2026/04/04 18:48:49 tnn Exp $
#
# This file determines the type of rust package to use.
#
@@ -62,3 +62,7 @@ BUILDLINK_DEPMETHOD.rust?= build
BUILDLINK_API_DEPENDS.rust+= rust>=${RUST_REQ}
. include "${RUST_DIR}/buildlink3.mk"
.endif
+
+.if ${OPSYS} == "NetBSD"
+ALL_ENV+= PTHREAD_KEYS_MAX=512
+.endif
Home |
Main Index |
Thread Index |
Old Index