diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-07-04 11:56:46 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-04 22:33:51 +0100 |
| commit | b3fa26bc777ec0136ce189d90123b50f6ee567b9 (patch) | |
| tree | e5d2c37dec449b7793ed44f4a0ad722431ef5512 | |
| parent | 0dcbaaaa9a7be79aef8c587616383986c89a98d0 (diff) | |
| download | meta-gplv2-b3fa26bc777ec0136ce189d90123b50f6ee567b9.tar.gz meta-gplv2-b3fa26bc777ec0136ce189d90123b50f6ee567b9.tar.bz2 meta-gplv2-b3fa26bc777ec0136ce189d90123b50f6ee567b9.zip | |
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>
| -rw-r--r-- | recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch | 12 |
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> src/sort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/sort.c b/src/sort.c -index 58ca66a..48b22c8 100644 --- a/src/sort.c +++ b/src/sort.c -@@ -21,11 +21,11 @@ +@@ -21,12 +21,12 @@ Ørn E. Hansen added NLS support in 1997. */ @@ -28,12 +26,10 @@ index 58ca66a..48b22c8 100644 +#include <sys/wait.h> #include <config.h> + #include <assert.h> #include <getopt.h> -#include <sys/types.h> -#include <sys/wait.h> #include <signal.h> - #include "system.h" - #include "argmatch.h" --- -2.32.0 - + #if HAVE_WCHAR_H + # include <wchar.h> |