Skip to contentSkip to conversation

coreutils: Rebase glibc 2.34 patch on top of series

PATCH New Khem Raj 1 participant 1 message Jul 4, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 coreutils: Rebase glibc 2.34 patch on top of series

This should fix the patch errors due to order of patching last time.

Cc Alexandre Belloni <[email protected]>
---
 ...Reorder-includes-for-glibc-2.34-portability.patch | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch +4 -8
index 0d9b5e2..f37cb47 100644
@@ -16,11 +16,9 @@ Signed-off-by: Khem Raj <[email protected]>
  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>
Signature · 1 line
2.32.0