main/numactl: upgrade to 2.0.17

test-distance no longer fails on x86, so re-enable tests there.

on the other hand, the ppc64le builder does not have numa
support in kernel at the moment, so disable tests for this arch.
This commit is contained in:
Celeste 2024-01-19 04:50:48 +00:00 committed by Kevin Daudt
parent 97fb08aff6
commit 2eb509de8c
2 changed files with 6 additions and 75 deletions

View File

@ -1,20 +1,18 @@
# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
pkgname=numactl
pkgver=2.0.16
pkgrel=4
pkgver=2.0.17
pkgrel=0
pkgdesc="Simple NUMA policy support"
url="https://github.com/numactl/numactl"
arch="all"
license="LGPL-2.1-only"
makedepends="linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="$pkgname-$pkgver-2.tar.gz::https://github.com/numactl/numactl/releases/download/v$pkgver/numactl-$pkgver.tar.gz
lfs64.patch
"
source="https://github.com/numactl/numactl/releases/download/v$pkgver/numactl-$pkgver.tar.gz"
case "$CARCH" in
x86)
# test-distance fails
ppc64le)
# no numa support in builder's kernel
options="$options !check"
;;
esac
@ -47,6 +45,5 @@ tools() {
}
sha512sums="
6e17724567c363a08994fe7f5569b6ec62bd1ae608244945fddcb2d6a212b08140340f0d862595ba4016fcba95193e851cb286798f685d314b4c72687af6d879 numactl-2.0.16-2.tar.gz
7a33f72496e49bacbd71962bdd091ae9c73b74bc0dff240791da680a98b8145091a5d3b0460caadd8fff3f6edcf151ea2419473e1aca5838f7fbef11a61c9e55 lfs64.patch
6b89ab146d050e4466a2a5b98e899e5bbf6a0c06b251abcb872d198b490ca891770faa9e5b5f8192581ab9259ab71ddea1d2ed740e8049b081138acfdf17be11 numactl-2.0.17.tar.gz
"

View File

@ -1,66 +0,0 @@
needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
--
From 851bbd5b963a7a5d95b8fe3102cf05972dc72655 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 15 Dec 2022 12:11:13 -0800
Subject: [PATCH] shm.c: Replace stat64/fstat64/ftruncate64mmap64 with normal
functions
These functions were needed when _FILE_OFFSET_BITS was not 64, using
AC_SYS_LARGEFILE will detect it correctly and make the normal variants
of these functions behave same as their *64 counterparts.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
shm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/shm.c b/shm.c
index 20537d9..5d0d1ab 100644
--- a/shm.c
+++ b/shm.c
@@ -24,8 +24,8 @@
#include <sys/mman.h>
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <sys/fcntl.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <errno.h>
#include <unistd.h>
@@ -135,7 +135,7 @@ void attach_sysvshm(char *name, char *opt)
/* Attach a shared memory file. */
void attach_shared(char *name, char *opt)
{
- struct stat64 st;
+ struct stat st;
shmfd = open(name, O_RDWR);
if (shmfd < 0) {
@@ -146,14 +146,14 @@ void attach_shared(char *name, char *opt)
if (shmfd < 0)
nerror("cannot create file %s", name);
}
- if (fstat64(shmfd, &st) < 0)
+ if (fstat(shmfd, &st) < 0)
err("shm stat");
/* the file size must be larger than mmap shmlen + shmoffset, otherwise SIGBUS
* will be caused when we access memory, because mmaped memory is no longer in
* the range of the file laster.
*/
if ((shmlen + shmoffset) > st.st_size) {
- if (ftruncate64(shmfd, shmlen + shmoffset) < 0) {
+ if (ftruncate(shmfd, shmlen + shmoffset) < 0) {
/* XXX: we could do it by hand, but it would it
would be impossible to apply policy then.
need to fix that in the kernel. */
@@ -168,7 +168,7 @@ void attach_shared(char *name, char *opt)
/* RED-PEN For shmlen > address space may need to map in pieces.
Left for some poor 32bit soul. */
- shmptr = mmap64(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
+ shmptr = mmap(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
if (shmptr == (char*)-1)
err("shm mmap");
}