Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1688589222198390"
MIME-Version: 1.0
Date: Wed, 5 Jul 2023 20:33:42 +0000
From: "Havard Eidnes" <he@netbsd.org>
Subject: CVS commit: pkgsrc/devel/cbindgen
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: he@netbsd.org
Message-Id: <20230705203342.E917CFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1688589222198390
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	he
Date:		Wed Jul  5 20:33:42 UTC 2023

Modified Files:
	pkgsrc/devel/cbindgen: Makefile distinfo
Added Files:
	pkgsrc/devel/cbindgen/patches:
	    patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs
	    patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

Log Message:
cbindgen: make this build with the newly added NetBSD/riscv64 rust.

(I used the not-yet-committed rust-bin package.)

Replicate the "libc" crate patch from the main rust package.
(A corresponding pull request sent upstream.)
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/cbindgen/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/cbindgen/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs \
    pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1688589222198390
Content-Disposition: inline
Content-Length: 4304
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/cbindgen/Makefile
diff -u pkgsrc/devel/cbindgen/Makefile:1.32 pkgsrc/devel/cbindgen/Makefile:1.33
--- pkgsrc/devel/cbindgen/Makefile:1.32	Thu Jun  1 07:55:08 2023
+++ pkgsrc/devel/cbindgen/Makefile	Wed Jul  5 20:33:42 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2023/06/01 07:55:08 adam Exp $
+# $NetBSD: Makefile,v 1.33 2023/07/05 20:33:42 he Exp $
 
 DISTNAME=	cbindgen-0.24.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mozilla/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}

Index: pkgsrc/devel/cbindgen/distinfo
diff -u pkgsrc/devel/cbindgen/distinfo:1.28 pkgsrc/devel/cbindgen/distinfo:1.29
--- pkgsrc/devel/cbindgen/distinfo:1.28	Thu Jun  1 07:55:08 2023
+++ pkgsrc/devel/cbindgen/distinfo	Wed Jul  5 20:33:42 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2023/06/01 07:55:08 adam Exp $
+$NetBSD: distinfo,v 1.29 2023/07/05 20:33:42 he Exp $
 
 BLAKE2s (atty-0.2.14.crate) = 8a58145c7b668aa6caf8d749e37857ff202211e1bfa9e441f130ff02feb68405
 SHA512 (atty-0.2.14.crate) = d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -135,3 +135,5 @@ Size (winapi-util-0.1.5.crate) = 10164 b
 BLAKE2s (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 85ecec73b9874f5f443e29d99f93a11889e74ddf5a4bfeb929e2355a7cee32f1
 SHA512 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 Size (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 bytes
+SHA1 (patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c849d09b86efb0ec1950f8c4b6d0e3ee6890bf55
+SHA1 (patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 03ceeb3121f8d7289ff40b4e207e8b849c8b0c29

Added files:

Index: pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null	Wed Jul  5 20:33:42 2023
+++ pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs	Wed Jul  5 20:33:42 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/07/05 20:33:42 he Exp $
+
+Add riscv64.
+
+--- ../vendor/libc-0.2.144/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	1973-11-29 21:33:09.000000000 +0000
++++ ../vendor/libc-0.2.144/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2807,6 +2807,9 @@ cfg_if! {
+     } else if #[cfg(target_arch = "x86")] {
+         mod x86;
+         pub use self::x86::*;
++    } else if #[cfg(target_arch = "riscv64")] {
++        mod riscv64;
++        pub use self::riscv64::*;
+     } else {
+         // Unknown target_arch
+     }
Index: pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u /dev/null pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
--- /dev/null	Wed Jul  5 20:33:42 2023
+++ pkgsrc/devel/cbindgen/patches/patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs	Wed Jul  5 20:33:42 2023
@@ -0,0 +1,31 @@
+$NetBSD: patch-vendor_libc-0.2.144_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2023/07/05 20:33:42 he Exp $
+
+Add riscv64 target description.
+
+--- ../vendor/libc-0.2.144/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig	2023-07-04 21:09:56.186350254 +0000
++++ ../vendor/libc-0.2.144/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -0,0 +1,24 @@
++use PT_FIRSTMACH;
++
++pub type c_long = i64;
++pub type c_ulong = u64;
++pub type c_char = u8;
++pub type __cpu_simple_lock_nv_t = ::c_int;
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 8 - 1;
++    }
++}
++
++// pub const _MAX_PAGE_SHIFT: u32 = 12;
++
++pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
++pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
++pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
++pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;


--_----------=_1688589222198390--