summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2022-05-13 18:19:07 +0000
committertnn <tnn@pkgsrc.org>2022-05-13 18:19:07 +0000
commit660345366227809e07f543545df45bb99776dd92 (patch)
tree419ab082e87fd1130138c37678509f047885f3a9 /devel
parentd32445ae454aae90b67723bf84be89e0bca9bed9 (diff)
downloadpkgsrc-660345366227809e07f543545df45bb99776dd92.tar.gz
cpu_features: stub some things to make it build on arm
Diffstat (limited to 'devel')
-rw-r--r--devel/cpu_features/distinfo5
-rw-r--r--devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c4
-rw-r--r--devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c13
3 files changed, 18 insertions, 4 deletions
diff --git a/devel/cpu_features/distinfo b/devel/cpu_features/distinfo
index ac9729e80d5..73b8f80c30b 100644
--- a/devel/cpu_features/distinfo
+++ b/devel/cpu_features/distinfo
@@ -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
diff --git a/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c b/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c
index 9e61c6b6e42..9e6a321af5a 100644
--- a/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c
+++ b/devel/cpu_features/patches/patch-src_impl__aarch64__linux__or__android.c
@@ -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-aarch64 for now.
#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"
diff --git a/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c b/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c
new file mode 100644
index 00000000000..22e3266d794
--- /dev/null
+++ b/devel/cpu_features/patches/patch-src_impl__arm__linux__or__android.c
@@ -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"
+