aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew J. Hesford <ajh@sideband.org>2024-02-26 14:57:27 +0000
committerAndrew J. Hesford <ajh@sideband.org>2024-02-26 15:26:58 +0000
commit2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1 (patch)
tree5e158badccc9108abd9b7d4780f76ac852598b1c
parentba9a5694978e3d2986c2364921dcdd71e62be603 (diff)
downloadvoid-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar.gz
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar.bz2
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar.lz
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar.xz
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.tar.zst
void-packages-2d5c9eaaa7a817a1658c5e9f988277cd50c3beb1.zip
numactl: update to 2.0.18.
-rw-r--r--srcpkgs/numactl/patches/musl.patch15
-rw-r--r--srcpkgs/numactl/patches/no-perl-regex.patch16
-rw-r--r--srcpkgs/numactl/template4
3 files changed, 25 insertions, 10 deletions
diff --git a/srcpkgs/numactl/patches/musl.patch b/srcpkgs/numactl/patches/musl.patch
index a566f050680..2a301304415 100644
--- a/srcpkgs/numactl/patches/musl.patch
+++ b/srcpkgs/numactl/patches/musl.patch
@@ -1,22 +1,21 @@
__GLIBC_PREREQ is only defined with glibc, so that only process it with __GLIBC__.
---- a/syscall.c 2014-10-20 16:12:53.000000000 +0200
-+++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200
-@@ -115,14 +115,16 @@
-
+--- a/syscall.c
++++ b/syscall.c
+@@ -153,7 +153,8 @@
+ # define __GLIBC_PREREQ(x,y) 0
#endif
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
+#if defined(__GLIBC__)
-+# if __GLIBC_PREREQ(2,11)
++# if __GLIBC_PREREQ(2, 11)
/* glibc 2.11 seems to have working 6 argument sycall. Use the
glibc supplied syscall in this case.
- The version cut-off is rather arbitary and could be probably
+@@ -161,6 +162,7 @@
earlier. */
--#define syscall6 syscall
-+# define syscall6 syscall
+ #define syscall6 syscall
+#endif
#elif defined(__x86_64__)
/* 6 argument calls on x86-64 are often buggy in both glibc and
diff --git a/srcpkgs/numactl/patches/no-perl-regex.patch b/srcpkgs/numactl/patches/no-perl-regex.patch
new file mode 100644
index 00000000000..4594e072caa
--- /dev/null
+++ b/srcpkgs/numactl/patches/no-perl-regex.patch
@@ -0,0 +1,16 @@
+The grep in xbps-src chroots does not support Perl regexes, so restore a prior
+version of the grep to identify highest and lowest nodes in test/bind_range.
+
+--- a/test/bind_range
++++ b/test/bind_range
+@@ -92,8 +92,8 @@
+ }
+
+ HIGHESTCPU=$(ls /sys/bus/cpu/devices | sed s/cpu// | sort -n | tail -1)
+-HIGHESTNODE=$(numactl -H | grep -Pzo 'node [0-9]* cpus: [0-9].*(.|\n)node [0-9]* size: [1-9].* MB' | tail -n1 | cut -f2 -d' ')
+-LOWESTNODE=$(numactl -H | grep -Pzo 'node [0-9]* cpus: [0-9].*(.|\n)node [0-9]* size: [1-9].* MB' | head -n1 | cut -f2 -d' ')
++HIGHESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus: [0-9]*' | tail -n1 | cut -f2 -d' ')
++LOWESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus: [0-9]*' | head -n1 | cut -f2 -d' ')
+
+ get_mask
+
diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template
index bccf5484e9e..629145b6bee 100644
--- a/srcpkgs/numactl/template
+++ b/srcpkgs/numactl/template
@@ -1,6 +1,6 @@
# Template file for 'numactl'
pkgname=numactl
-version=2.0.14
+version=2.0.18
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://github.com/numactl/numactl"
distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz"
-checksum=1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035
+checksum=8cd6c13f3096e9c2293c1d732f56e2aa37a7ada1a98deed3fac7bd6da1aaaaf6
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# XXX