Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A0AD684E55 for ; Sat, 26 Aug 2023 17:18:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id f6VGEO0AI50r for ; Sat, 26 Aug 2023 17:18:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 03F1484D4B for ; Sat, 26 Aug 2023 17:18:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4BB2EFBDB; Sat, 26 Aug 2023 17:15:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1693070124229200" MIME-Version: 1.0 Date: Sat, 26 Aug 2023 17:15:24 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/sysutils/onefetch To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20230826171524.4BB2EFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1693070124229200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sat Aug 26 17:15:24 UTC 2023 Modified Files: pkgsrc/sysutils/onefetch: Makefile distinfo Added Files: pkgsrc/sysutils/onefetch/patches: patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt Log Message: sysutils/onefetch: Fix build on NetBSD/powerpc. We do this by forcefully not probing for POWER8 or POWER9 in vendor/libz-ng-sys-1.1.8. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/onefetch/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/onefetch/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/onefetch/patches/patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1693070124229200 Content-Disposition: inline Content-Length: 3113 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/onefetch/Makefile diff -u pkgsrc/sysutils/onefetch/Makefile:1.27 pkgsrc/sysutils/onefetch/Makefile:1.28 --- pkgsrc/sysutils/onefetch/Makefile:1.27 Mon Jun 26 08:21:09 2023 +++ pkgsrc/sysutils/onefetch/Makefile Sat Aug 26 17:15:23 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2023/06/26 08:21:09 pin Exp $ +# $NetBSD: Makefile,v 1.28 2023/08/26 17:15:23 he Exp $ DISTNAME= onefetch-2.18.1 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=o2sh/} Index: pkgsrc/sysutils/onefetch/distinfo diff -u pkgsrc/sysutils/onefetch/distinfo:1.25 pkgsrc/sysutils/onefetch/distinfo:1.26 --- pkgsrc/sysutils/onefetch/distinfo:1.25 Mon Jun 26 08:21:09 2023 +++ pkgsrc/sysutils/onefetch/distinfo Sat Aug 26 17:15:23 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2023/06/26 08:21:09 pin Exp $ +$NetBSD: distinfo,v 1.26 2023/08/26 17:15:23 he Exp $ BLAKE2s (addr2line-0.19.0.crate) = c0485ba9fdf036b53d78b606222e7ce9d647d27f582d7df92948b8dbd686a8bb SHA512 (addr2line-0.19.0.crate) = 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94 @@ -1218,3 +1218,4 @@ Size (zstd-safe-5.0.2+zstd.1.5.2.crate) BLAKE2s (zstd-sys-2.0.1+zstd.1.5.2.crate) = 4c473c76ca5254bd77d77de889e4eda51596896aff105a2f68ed977da0ee53b8 SHA512 (zstd-sys-2.0.1+zstd.1.5.2.crate) = a54ff4159640d31f898cbd374b9117d1e7ee4b54c5b4a8e1ed6286d9e954341e077088c52161e086ef0f28dfec13e03f64013712fa9bc59d471191cffd8e0e1e Size (zstd-sys-2.0.1+zstd.1.5.2.crate) = 715552 bytes +SHA1 (patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt) = b79f717c7d6f1c9567f795e111edf9fdf5c7b84a Added files: Index: pkgsrc/sysutils/onefetch/patches/patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt diff -u /dev/null pkgsrc/sysutils/onefetch/patches/patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt:1.1 --- /dev/null Sat Aug 26 17:15:24 2023 +++ pkgsrc/sysutils/onefetch/patches/patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt Sat Aug 26 17:15:24 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-vendor_libz-ng-sys-1.1.8_src_zlib-ng_CMakeLists.txt,v 1.1 2023/08/26 17:15:24 he Exp $ + +Don't try to enable the POWER8 or POWER9 options on PPC. + +--- ../vendor/libz-ng-sys-1.1.8/src/zlib-ng/CMakeLists.txt.orig 1973-11-29 21:33:09.000000000 +0000 ++++ ../vendor/libz-ng-sys-1.1.8/src/zlib-ng/CMakeLists.txt +@@ -104,8 +104,8 @@ if(BASEARCH_ARM_FOUND) + option(WITH_NEON "Build with NEON intrinsics" ON) + elseif(BASEARCH_PPC_FOUND) + option(WITH_ALTIVEC "Build with AltiVec (VMX) optimisations for PowerPC" ON) +- option(WITH_POWER8 "Build with optimisations for POWER8" ON) +- option(WITH_POWER9 "Build with optimisations for POWER9" ON) ++# option(WITH_POWER8 "Build with optimisations for POWER8" ON) ++# option(WITH_POWER9 "Build with optimisations for POWER9" ON) + elseif(BASEARCH_S360_FOUND) + option(WITH_DFLTCC_DEFLATE "Build with DFLTCC intrinsics for compression on IBM Z" OFF) + option(WITH_DFLTCC_INFLATE "Build with DFLTCC intrinsics for decompression on IBM Z" OFF) --_----------=_1693070124229200--