numactl: update to 2.0.18.

This commit is contained in:
Andrew J. Hesford 2024-02-26 09:57:27 -05:00
parent ba9a569497
commit 2d5c9eaaa7
3 changed files with 25 additions and 10 deletions

View File

@ -1,22 +1,21 @@
__GLIBC_PREREQ is only defined with glibc, so that only process it with __GLIBC__. __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 --- a/syscall.c
+++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200 +++ b/syscall.c
@@ -115,14 +115,16 @@ @@ -153,7 +153,8 @@
# define __GLIBC_PREREQ(x,y) 0
#endif #endif
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) -#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
+#if defined(__GLIBC__) +#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 2.11 seems to have working 6 argument sycall. Use the
glibc supplied syscall in this case. glibc supplied syscall in this case.
The version cut-off is rather arbitary and could be probably @@ -161,6 +162,7 @@
earlier. */ earlier. */
-#define syscall6 syscall #define syscall6 syscall
+# define syscall6 syscall
+#endif +#endif
#elif defined(__x86_64__) #elif defined(__x86_64__)
/* 6 argument calls on x86-64 are often buggy in both glibc and /* 6 argument calls on x86-64 are often buggy in both glibc and

View File

@ -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

View File

@ -1,6 +1,6 @@
# Template file for 'numactl' # Template file for 'numactl'
pkgname=numactl pkgname=numactl
version=2.0.14 version=2.0.18
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="automake libtool" hostmakedepends="automake libtool"
@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only" license="LGPL-2.1-only"
homepage="https://github.com/numactl/numactl" homepage="https://github.com/numactl/numactl"
distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz" distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz"
checksum=1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035 checksum=8cd6c13f3096e9c2293c1d732f56e2aa37a7ada1a98deed3fac7bd6da1aaaaf6
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# XXX # XXX