package/numactl: remove patches
PATCH 1/1 package/numactl: remove patches
Both patches are already included in version 2.0.12
--- ...LIBC_PREREQ-for-non-glibc-toolchains.patch | 35 ----------------- ...LIBC_PREREQ-for-non-glibc-toolchains.patch | 39 ------------------- 2 files changed, 74 deletions(-) delete mode 100644 package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch delete mode 100644 package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Fri, 12 Feb 2016 19:25:02 +0100 -Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains - -The way __GLIBC_PREREQ() is currently used means that it's evaluated -even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will -not exist if __GLIBC__ is not defined, causing build failures on C -libraries not defining __GLIBC__ such as the musl C library. - -Patch originally taken from: -https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch - -Signed-off-by: Bernd Kuhls <[email protected]> -[Bernd: Reworked to fix uClibc] -Signed-off-by: Thomas Petazzoni <[email protected]> -[Thomas: improve patch description.] -[Upstream commit: https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.] ---- - syscall.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syscall.c b/syscall.c -index 4589b85..37782d9 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -115,7 +115,7 @@ - - #endif - --#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) -+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11) - - /* glibc 2.11 seems to have working 6 argument sycall. Use the - glibc supplied syscall in this case.
package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 31dc2951c758698bff060aeae8ffd8854616183b Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Fri, 12 Feb 2016 19:25:02 +0100 -Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains - -The way __GLIBC_PREREQ() is currently used means that it's evaluated -even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will -not exist if __GLIBC__ is not defined, causing build failures on C -libraries not defining __GLIBC__ such as the musl C library. - -Patch originally taken from: -https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch - -Signed-off-by: Bernd Kuhls <[email protected]> -[Bernd: Reworked to fix uClibc] -Signed-off-by: Thomas Petazzoni <[email protected]> -[Thomas: improve patch description.] -[Upstream commit: https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b] ---- - syscall.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/syscall.c b/syscall.c -index 37782d9..255853d 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -115,7 +115,11 @@ - - #endif - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11) -+#ifndef __GLIBC_PREREQ -+# define __GLIBC_PREREQ(x,y) 0 -+#endif -+ -+#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) - - /* glibc 2.11 seems to have working 6 argument sycall. Use the - glibc supplied syscall in this case.
Signature · 1 line
2.20.1
PATCH 1/1 package/numactl: remove patches
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Both patches are already included in version 2.0.12
Signed-off-by Fabrice Fontaine <[email protected]>
This sounded odd to me (E.G. why do the patches then still apply?), so I had a closer look. Indeed, upstream now also has the following just above the hunk touched by the patches:
#ifndef __GLIBC_PREREQ
# define __GLIBC_PREREQ(x,y) 0 #endif
And given that we allow some fuzz when applying patches, the 2 patches do apply and we end up with these 3 lines twice in the file.
Committed after extending the commit message a bit, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/numactl: remove patches
In reply to Fabrice FontaineQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Both patches are already included in version 2.0.12
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard