diff mbox

[v3,1/1] package/numactl: Fix uClibc compile breakage after musl compile fix

Message ID 20160215233043.39f36d97@free-electrons.com
State Not Applicable
Headers show

Commit Message

Thomas Petazzoni Feb. 15, 2016, 10:30 p.m. UTC 
Bernd,

On Sun, 14 Feb 2016 15:11:50 +0100, Bernd Kuhls wrote:

> the code you mentioned above was the first PR I sent on github[1] and 
> received this answer: 
> https://github.com/numactl/numactl/pull/4#issuecomment-183441544
> 
> "I don't think the patch is correct. If GLIBC_PREREQ fails the #elif 
> defined(__x86_64) path still needs to be taken. So you need to combine 
> the two #ifs into one line"
> 
> And combining the two #ifs into one line breaks compilation on musl so I 
> wrote the current patch.

Can you try the below patch instead?


Thanks,

Thomas
diff mbox

Patch

Index: b/syscall.c
===================================================================
--- a/syscall.c
+++ b/syscall.c
@@ -115,7 +115,13 @@ 
 
 #endif
 
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
+#if defined(__GLIBC__)
+# if __GLIBC_PREREQ(2, 11)
+#  define GLIBC_HAS_WORKING_SYSCALL6
+# endif
+#endif
+
+#if defined(GLIBC_HAS_WORKING_SYSCALL6)
 
 /* glibc 2.11 seems to have working 6 argument sycall. Use the
    glibc supplied syscall in this case.