summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-07-04 11:56:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-04 22:33:51 +0100
commitb3fa26bc777ec0136ce189d90123b50f6ee567b9 (patch)
treee5d2c37dec449b7793ed44f4a0ad722431ef5512 /recipes-core
parent0dcbaaaa9a7be79aef8c587616383986c89a98d0 (diff)
downloadmeta-gplv2-b3fa26bc777ec0136ce189d90123b50f6ee567b9.tar.gz
coreutils: Rebase glibc 2.34 patch on top of series3.4_M2
This should fix the patch errors due to order of patching last time. Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
index 0d9b5e2..f37cb47 100644
--- a/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
+++ b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
@@ -16,11 +16,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 src/sort.c | 4 ++-- 16 src/sort.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/src/sort.c b/src/sort.c
20index 58ca66a..48b22c8 100644
21--- a/src/sort.c 19--- a/src/sort.c
22+++ b/src/sort.c 20+++ b/src/sort.c
23@@ -21,11 +21,11 @@ 21@@ -21,12 +21,12 @@
24 22
25 Ørn E. Hansen added NLS support in 1997. */ 23 Ørn E. Hansen added NLS support in 1997. */
26 24
@@ -28,12 +26,10 @@ index 58ca66a..48b22c8 100644
28+#include <sys/wait.h> 26+#include <sys/wait.h>
29 #include <config.h> 27 #include <config.h>
30 28
29 #include <assert.h>
31 #include <getopt.h> 30 #include <getopt.h>
32-#include <sys/types.h> 31-#include <sys/types.h>
33-#include <sys/wait.h> 32-#include <sys/wait.h>
34 #include <signal.h> 33 #include <signal.h>
35 #include "system.h" 34 #if HAVE_WCHAR_H
36 #include "argmatch.h" 35 # include <wchar.h>
37--
382.32.0
39