pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
brush-shell: fix build
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Wed Jun 10 09:16:57 2026 +0200
Changeset: 5c0aa5795c7c2141cbfc4a1ec58c3c1149b9e336
Modified Files:
brush-shell/Makefile
brush-shell/PLIST
brush-shell/distinfo
Added Files:
brush-shell/patches/patch-.._vendor_nix-0.31.2_src_sys_wait.rs
Log Message:
brush-shell: fix build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5c0aa5795c7c2141cbfc4a1ec58c3c1149b9e336
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
brush-shell/Makefile | 12 ++++++++-
brush-shell/PLIST | 4 +--
brush-shell/distinfo | 1 +
.../patch-.._vendor_nix-0.31.2_src_sys_wait.rs | 30 ++++++++++++++++++++++
4 files changed, 43 insertions(+), 4 deletions(-)
diffs:
diff --git a/brush-shell/Makefile b/brush-shell/Makefile
index 689a4b25ea..f1abea392a 100644
--- a/brush-shell/Makefile
+++ b/brush-shell/Makefile
@@ -13,7 +13,17 @@ COMMENT= brush (Bo(u)rn(e) RUsty SHell) is a modern bash- and POSIX- compatible
LICENSE= mit
WRKSRC= ${WRKDIR}/brush-brush-shell-v0.4.0
-USE_LANGUAGES+= c
+
+RUST_REQ= 1.88.0
+USE_TOOLS+= pkg-config
+
+INSTALLATION_DIRS= bin
+
+PKG_SHELL= bin/brush
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/target/release/brush \
+ ${DESTDIR}${PREFIX}/bin
.include "cargo-depends.mk"
diff --git a/brush-shell/PLIST b/brush-shell/PLIST
index 92ba51a2d7..4e82d13a1c 100644
--- a/brush-shell/PLIST
+++ b/brush-shell/PLIST
@@ -1,4 +1,2 @@
@comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/brush
diff --git a/brush-shell/distinfo b/brush-shell/distinfo
index 5fa7ea97e9..203002ab5f 100644
--- a/brush-shell/distinfo
+++ b/brush-shell/distinfo
@@ -1971,3 +1971,4 @@ Size (zerovec-derive-0.11.3.crate) = 22115 bytes
BLAKE2s (zmij-1.0.21.crate) = a2d1e7214230c8f4e8c946d28215765c131da3aac89f1001daf534335307648e
SHA512 (zmij-1.0.21.crate) = a488f11ec8721ddfe42e61d028a128818551de8fccd69d7824504e4ae2efccdc38f716fa5a10ef4de07a8a087e75e819c4a1e0790817e8539b5db697bde14585
Size (zmij-1.0.21.crate) = 26665 bytes
+SHA1 (patch-.._vendor_nix-0.31.2_src_sys_wait.rs) = 95cec7427a50f53e58ec439e010ea5a3dbcf1e6e
diff --git a/brush-shell/patches/patch-.._vendor_nix-0.31.2_src_sys_wait.rs b/brush-shell/patches/patch-.._vendor_nix-0.31.2_src_sys_wait.rs
new file mode 100644
index 0000000000..c0370de0d5
--- /dev/null
+++ b/brush-shell/patches/patch-.._vendor_nix-0.31.2_src_sys_wait.rs
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Fix build on NetBSD.
+
+--- ../vendor/nix-0.31.2/src/sys/wait.rs.orig 2026-06-10 06:47:04.530136501 +0000
++++ ../vendor/nix-0.31.2/src/sys/wait.rs
+@@ -241,6 +241,7 @@ impl WaitStatus {
+ #[cfg(any(
+ target_os = "android",
+ target_os = "freebsd",
++ target_os = "netbsd",
+ target_os = "haiku",
+ all(target_os = "linux", not(target_env = "uclibc")),
+ ))]
+@@ -326,6 +327,7 @@ pub fn wait() -> Result<WaitStatus> {
+ #[cfg(any(
+ target_os = "android",
+ target_os = "freebsd",
++ target_os = "netbsd",
+ target_os = "haiku",
+ all(target_os = "linux", not(target_env = "uclibc")),
+ ))]
+@@ -354,6 +356,7 @@ pub enum Id<'fd> {
+ #[cfg(any(
+ target_os = "android",
+ target_os = "freebsd",
++ target_os = "netbsd",
+ target_os = "haiku",
+ all(target_os = "linux", not(target_env = "uclibc")),
+ ))]
Home |
Main Index |
Thread Index |
Old Index