* [Buildroot] [PATCH 1/1] package/bash: fix seventh patch
@ 2021-03-12 7:08 Fabrice Fontaine
2021-03-12 18:16 ` Peter Seiderer
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-03-12 7:08 UTC (permalink / raw)
To: buildroot
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>
---
...-glob-fix-dequote_pathname-vs.-udequote_pathname.patch | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
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
--
2.30.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 1/1] package/bash: fix seventh patch
2021-03-12 7:08 [Buildroot] [PATCH 1/1] package/bash: fix seventh patch Fabrice Fontaine
@ 2021-03-12 18:16 ` Peter Seiderer
2021-03-12 19:51 ` Ryan Barnett
2021-03-12 21:02 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: Peter Seiderer @ 2021-03-12 18:16 UTC (permalink / raw)
To: buildroot
Hello Fabrice,
On Fri, 12 Mar 2021 08:08:03 +0100, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> 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>
Thanks for taking care of the failure and fixing it...
Tested-by: Peter Seiderer <ps.report@gmx.net>
Regards,
Peter
> ---
> ...-glob-fix-dequote_pathname-vs.-udequote_pathname.patch | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/bash: fix seventh patch
2021-03-12 7:08 [Buildroot] [PATCH 1/1] package/bash: fix seventh patch Fabrice Fontaine
2021-03-12 18:16 ` Peter Seiderer
@ 2021-03-12 19:51 ` Ryan Barnett
2021-03-12 21:02 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: Ryan Barnett @ 2021-03-12 19:51 UTC (permalink / raw)
To: buildroot
On Fri, Mar 12, 2021 at 1:11 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> 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>
> ---
> ...-glob-fix-dequote_pathname-vs.-udequote_pathname.patch | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
Thanks for the patch as the building of bash on master is currently broken...
Tested-by: Ryan Barnett <ryan.barnett@rockwellcollins.com>
Thanks,
-Ryan
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/bash: fix seventh patch
2021-03-12 7:08 [Buildroot] [PATCH 1/1] package/bash: fix seventh patch Fabrice Fontaine
2021-03-12 18:16 ` Peter Seiderer
2021-03-12 19:51 ` Ryan Barnett
@ 2021-03-12 21:02 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2021-03-12 21:02 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2021-03-12 08:08 +0100, Fabrice Fontaine spake thusly:
> 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>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...-glob-fix-dequote_pathname-vs.-udequote_pathname.patch | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> 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
> --
> 2.30.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-12 21:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-12 7:08 [Buildroot] [PATCH 1/1] package/bash: fix seventh patch Fabrice Fontaine
2021-03-12 18:16 ` Peter Seiderer
2021-03-12 19:51 ` Ryan Barnett
2021-03-12 21:02 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox