From 192ee8233c69c74c1b85844b0e77e7749b4af565 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 22 Jun 2015 08:15:59 +0200 Subject: [PATCH] numactl: fix musl build with a patch by yours truly. --- srcpkgs/numactl/patches/musl.patch | 23 +++++++++++++++++++++++ srcpkgs/numactl/template | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/numactl/patches/musl.patch diff --git a/srcpkgs/numactl/patches/musl.patch b/srcpkgs/numactl/patches/musl.patch new file mode 100644 index 00000000000..1537d85cad6 --- /dev/null +++ b/srcpkgs/numactl/patches/musl.patch @@ -0,0 +1,23 @@ +__GLIBC_PREREQ is only defined with glibc, so that only process it with __GLIBC__. + +--- syscall.c.orig 2014-10-20 16:12:53.000000000 +0200 ++++ syscall.c 2015-06-22 08:13:22.729034702 +0200 +@@ -115,14 +115,16 @@ + + #endif + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) ++#if defined(__GLIBC__) ++# 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 + earlier. */ + +-#define syscall6 syscall ++# define syscall6 syscall ++#endif + #elif defined(__x86_64__) + /* 6 argument calls on x86-64 are often buggy in both glibc and + asm/unistd.h. Add a working version here. */ diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index ac43cb3f3fa..0d85f9872ed 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -1,7 +1,7 @@ # Template file for 'numactl' pkgname=numactl version=2.0.10 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Simple NUMA policy support" @@ -10,7 +10,7 @@ license="LGPL-2.1" homepage="http://oss.sgi.com/projects/libnuma/" distfiles="ftp://oss.sgi.com/www/projects/libnuma/download/${pkgname}-${version}.tar.gz" checksum=dbdac8fe74f13b2e2864bba352f1597ab1d3345c8c485d7805f58d66f414db61 -only_for_archs="i686 x86_64" +only_for_archs="i686 i686-musl x86_64 x86_64-musl" pre_configure() { NOCONFIGURE=1 ./autogen.sh