diff mbox series

[1/1] package/numactl: remove patches

Message ID 20190407090614.19628-1-fontaine.fabrice@gmail.com
State Accepted
Commit 0fda716432fb43c0d275c7194a33a20d106acdf9
Headers show
Series [1/1] package/numactl: remove patches | expand

Commit Message

Fabrice Fontaine April 7, 2019, 9:06 a.m. UTC 
Both patches are already included in version 2.0.12

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...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

Comments

Peter Korsgaard April 7, 2019, 1:12 p.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Both patches are already included in version 2.0.12
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

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.
Peter Korsgaard April 14, 2019, 8:32 p.m. UTC | #2 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Both patches are already included in version 2.0.12
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.
diff mbox series

Patch

diff --git a/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
deleted file mode 100644
index ebb934f60f..0000000000
--- a/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-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 <bernd.kuhls@t-online.de>
-[Bernd: Reworked to fix uClibc]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[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.
diff --git a/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
deleted file mode 100644
index a98fd7247c..0000000000
--- a/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 31dc2951c758698bff060aeae8ffd8854616183b Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-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 <bernd.kuhls@t-online.de>
-[Bernd: Reworked to fix uClibc]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[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.