From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 12 Mar 2021 07:08:03 +0000 (+0100)
Subject: package/bash: fix seventh patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be8f305a95957728f023dd1fe76853622313594d;p=buildroot.git

package/bash: fix seventh patch

Since bump to version 5.1 in commit
9e778b044c949d165207150cc9e79fdcfbafcb9d, seventh patch wrongly defines
wcdequote_pathname as static which will result in the following build
failure:

smatch.c:(.text+0x22f0): undefined reference to `wcdequote_pathname'

Fixes:
 - http://autobuild.buildroot.org/results/d83f5d260dccd38984ec6fdb340835ca928bb687

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Tested-by: Ryan Barnett <ryan.barnett@rockwellcollins.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---

diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch
index b769dc296e..a801f68236 100644
--- a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch
+++ b/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch
@@ -27,13 +27,7 @@ diff --git a/lib/glob/glob.c b/lib/glob/glob.c
 index eb6277f..c903b15 100644
 --- a/lib/glob/glob.c
 +++ b/lib/glob/glob.c
-@@ -117,12 +117,11 @@ static int mbskipname PARAMS((char *, char *, int));
- #endif
- void udequote_pathname PARAMS((char *));
- #if HANDLE_MULTIBYTE
--void wcdequote_pathname PARAMS((wchar_t *));
-+static void wcdequote_pathname PARAMS((wchar_t *));
- static void wdequote_pathname PARAMS((char *));
+@@ -117,6 +117,5 @@ static int mbskipname PARAMS((char *, char *, int));
  #else
  #  define dequote_pathname udequote_pathname
  #endif