Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3E55B84D36 for ; Sun, 3 Sep 2023 17:00:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oBwq3NmaTH5O for ; Sun, 3 Sep 2023 17:00:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A9BD384CD8 for ; Sun, 3 Sep 2023 17:00:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A2C12FBDB; Sun, 3 Sep 2023 17:00:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169376041865820" MIME-Version: 1.0 Date: Sun, 3 Sep 2023 17:00:18 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/devel/cargo-c To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20230903170018.A2C12FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169376041865820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sun Sep 3 17:00:18 UTC 2023 Modified Files: pkgsrc/devel/cargo-c: distinfo Added Files: pkgsrc/devel/cargo-c/patches: patch-vendor_faster-hex-0.8.0_src_lib.rs Log Message: cargo-c: fix build of vendored crate faster-hex on i386. Unify the conditionals used for use and definition of the vectorization_support_no_cache_x86() function. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/cargo-c/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/cargo-c/patches/patch-vendor_faster-hex-0.8.0_src_lib.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169376041865820 Content-Disposition: inline Content-Length: 2143 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cargo-c/distinfo diff -u pkgsrc/devel/cargo-c/distinfo:1.7 pkgsrc/devel/cargo-c/distinfo:1.8 --- pkgsrc/devel/cargo-c/distinfo:1.7 Mon Aug 28 08:20:15 2023 +++ pkgsrc/devel/cargo-c/distinfo Sun Sep 3 17:00:18 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2023/08/28 08:20:15 pin Exp $ +$NetBSD: distinfo,v 1.8 2023/09/03 17:00:18 he Exp $ BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 @@ -888,3 +888,4 @@ Size (winnow-0.5.15.crate) = 145621 byte BLAKE2s (zeroize-1.6.0.crate) = f2055440b7c90a2a0ebd0997466b65fc1f83ae7af9f346740346de90c914e36a SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b Size (zeroize-1.6.0.crate) = 19049 bytes +SHA1 (patch-vendor_faster-hex-0.8.0_src_lib.rs) = 3d532cb17a015b1b16a68a43f780d0109608efc7 Added files: Index: pkgsrc/devel/cargo-c/patches/patch-vendor_faster-hex-0.8.0_src_lib.rs diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-vendor_faster-hex-0.8.0_src_lib.rs:1.1 --- /dev/null Sun Sep 3 17:00:18 2023 +++ pkgsrc/devel/cargo-c/patches/patch-vendor_faster-hex-0.8.0_src_lib.rs Sun Sep 3 17:00:18 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-vendor_faster-hex-0.8.0_src_lib.rs,v 1.1 2023/09/03 17:00:18 he Exp $ + +Unify conditions for vectorization_support() use and definition. + +--- ../vendor/faster-hex-0.8.0/src/lib.rs.orig 2006-07-24 01:21:28.000000000 +0000 ++++ ../vendor/faster-hex-0.8.0/src/lib.rs +@@ -43,7 +43,8 @@ pub(crate) enum Vectorization { + + #[inline(always)] + pub(crate) fn vectorization_support() -> Vectorization { +- #[cfg(all(any(target_arch = "x86", target_arch = "x86_64")))] ++ #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), ++ target_feature = "sse"))] + { + use core::sync::atomic::{AtomicU8, Ordering}; + static FLAGS: AtomicU8 = AtomicU8::new(u8::MAX); --_----------=_169376041865820--