Received: by mail.netbsd.org (Postfix, from userid 605) id 3710384F15; Fri, 13 May 2022 18:18:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6FAFA84EE8 for ; Fri, 13 May 2022 18:18:45 +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 xmL5rz4lVWKk for ; Fri, 13 May 2022 18:18:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CA08184D8B for ; Fri, 13 May 2022 18:18:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 02C23FA94; Fri, 13 May 2022 18:19:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165246594715190" MIME-Version: 1.0 Date: Fri, 13 May 2022 18:19:07 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/cpu_features To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220513181908.02C23FA94@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165246594715190 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Fri May 13 18:19:07 UTC 2022 Modified Files: pkgsrc/devel/cpu_features: distinfo pkgsrc/devel/cpu_features/patches: patch-src_impl__aarch64__linux__or__android.c Added Files: pkgsrc/devel/cpu_features/patches: patch-src_impl__arm__linux__or__android.c Log Message: cpu_features: stub some things to make it build on arm To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/cpu_features/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165246594715190 Content-Disposition: inline Content-Length: 3329 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cpu_features/distinfo diff -u pkgsrc/devel/cpu_features/distinfo:1.6 pkgsrc/devel/cpu_features/distinfo:1.7 --- pkgsrc/devel/cpu_features/distinfo:1.6 Fri May 13 10:39:35 2022 +++ pkgsrc/devel/cpu_features/distinfo Fri May 13 18:19:07 2022 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.6 2022/05/13 10:39:35 tnn Exp $ +$NetBSD: distinfo,v 1.7 2022/05/13 18:19:07 tnn Exp $ BLAKE2s (cpu_features-0.7.0.tar.gz) = b442c655fd0e0d8d92a8559459585c73bac39c976fbfbc475089088f155c90fc SHA512 (cpu_features-0.7.0.tar.gz) = e602c88c4a104d69dff0297a4c4f8e26d02d548fc35ce2616429ff8280f2a37e9eaa99451a38b7c302907352cf15bdf8c09c2e0e52b09bf4cd3b7e2b21f8ddb0 Size (cpu_features-0.7.0.tar.gz) = 85986 bytes SHA1 (patch-CMakeLists.txt) = 7e8c409b6a4fcb3f98153d33be658d501c17b1c7 SHA1 (patch-include_cpu__features__macros.h) = 5bef216cceab5442b89351f96c78aa9d1a69ae1f -SHA1 (patch-src_impl__aarch64__linux__or__android.c) = f4ef0a8273fe403658fd79c80f615e5c3d6b4e5d +SHA1 (patch-src_impl__aarch64__linux__or__android.c) = a5f8648dd5b53b6e5925be14a96c1e5c20fcda6b +SHA1 (patch-src_impl__arm__linux__or__android.c) = 18bf1e9df82d8b4b6ce3a6c8f0c5f693e31ace3f SHA1 (patch-src_impl__x86__linux__or__android.c) = a9b7c73c1d25302c4986f8a732f3ae01ea902f1b Index: pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c diff -u pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c:1.1 pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c:1.2 --- pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c:1.1 Fri May 13 10:39:35 2022 +++ pkgsrc/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c Fri May 13 18:19:07 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_impl__aarch64__linux__or__android.c,v 1.1 2022/05/13 10:39:35 tnn Exp $ +$NetBSD: patch-src_impl__aarch64__linux__or__android.c,v 1.2 2022/05/13 18:19:07 tnn Exp $ Use /proc/cpuinfo on NetBSD/evbarm-aarch64 for now. @@ -9,7 +9,7 @@ Use /proc/cpuinfo on NetBSD/evbarm-aarch #ifdef CPU_FEATURES_ARCH_AARCH64 -#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID) -+#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID) || defined(CPU_FEATURES_OS_NETBSD) ++#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID) || defined(CPU_FEATURES_OS_NETBSD) || defined(CPU_FEATURES_OS_MACOS) #include "cpuinfo_aarch64.h" Added files: Index: pkgsrc/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c diff -u /dev/null pkgsrc/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c:1.1 --- /dev/null Fri May 13 18:19:07 2022 +++ pkgsrc/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c Fri May 13 18:19:07 2022 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_impl__arm__linux__or__android.c,v 1.1 2022/05/13 18:19:07 tnn Exp $ + +--- src/impl_arm_linux_or_android.c.orig 2022-03-08 10:31:24.000000000 +0000 ++++ src/impl_arm_linux_or_android.c +@@ -15,7 +15,7 @@ + #include "cpu_features_macros.h" + + #ifdef CPU_FEATURES_ARCH_ARM +-#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID) ++#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID) || defined(CPU_FEATURES_OS_NETBSD) + + #include "cpuinfo_arm.h" + --_----------=_165246594715190--