* [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition
@ 2020-02-09 20:09 Max Filippov
2020-02-09 21:34 ` Yann E. MORIN
2020-03-10 22:20 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Max Filippov @ 2020-02-09 20:09 UTC (permalink / raw)
To: buildroot
Recent is*_l fix broke uclibc build because removed __isctype_l
definition was used in libc/misc/ctype/ctype.c. Restore it.
Fixes: 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
.../0001-include-ctype.h-drop-is-_l-macro-definitions.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
index 5557a9c1e730..41c9d3d2bd81 100644
--- a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
+++ b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
@@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
index ecd5e730886a..e934cf3321a6 100644
--- a/include/ctype.h
+++ b/include/ctype.h
-@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
+@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
/* Return the uppercase version of C. */
extern int toupper_l (int __c, __locale_t __l) __THROW;
@@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
-# endif /* Optimizing gcc */
-
-
--# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
+ # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
# ifndef __NO_CTYPE
-# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l))
-# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l))
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition
2020-02-09 20:09 [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition Max Filippov
@ 2020-02-09 21:34 ` Yann E. MORIN
2020-03-10 22:20 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-02-09 21:34 UTC (permalink / raw)
To: buildroot
Max, All,
On 2020-02-09 12:09 -0800, Max Filippov spake thusly:
> Recent is*_l fix broke uclibc build because removed __isctype_l
> definition was used in libc/misc/ctype/ctype.c. Restore it.
>
> Fixes: 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Thanks for the quick fix! :-)
I've applied to master, with the folowing changes:
- add new patch, don't fix existing one
- add URL to upstream ML post
Regards,
Yann E. MORIN.
> ---
> .../0001-include-ctype.h-drop-is-_l-macro-definitions.patch | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> index 5557a9c1e730..41c9d3d2bd81 100644
> --- a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> +++ b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> @@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
> index ecd5e730886a..e934cf3321a6 100644
> --- a/include/ctype.h
> +++ b/include/ctype.h
> -@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
> +@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
> /* Return the uppercase version of C. */
> extern int toupper_l (int __c, __locale_t __l) __THROW;
>
> @@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
> -# endif /* Optimizing gcc */
> -
> -
> --# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
> + # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
> # ifndef __NO_CTYPE
> -# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l))
> -# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l))
> --
> 2.20.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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] 3+ messages in thread* [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition
2020-02-09 20:09 [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition Max Filippov
2020-02-09 21:34 ` Yann E. MORIN
@ 2020-03-10 22:20 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-03-10 22:20 UTC (permalink / raw)
To: buildroot
>>>>> "Max" == Max Filippov <jcmvbkbc@gmail.com> writes:
> Recent is*_l fix broke uclibc build because removed __isctype_l
> definition was used in libc/misc/ctype/ctype.c. Restore it.
> Fixes: 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Committed to 2019.11.x, thanks.
> ---
> .../0001-include-ctype.h-drop-is-_l-macro-definitions.patch | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> diff --git a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> index 5557a9c1e730..41c9d3d2bd81 100644
> --- a/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> +++ b/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
> @@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
> index ecd5e730886a..e934cf3321a6 100644
> --- a/include/ctype.h
> +++ b/include/ctype.h
> -@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
> +@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
> /* Return the uppercase version of C. */
> extern int toupper_l (int __c, __locale_t __l) __THROW;
> @@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
> -# endif /* Optimizing gcc */
> -
> -
> --# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
> + # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
> # ifndef __NO_CTYPE
> -# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l))
> -# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l))
> --
> 2.20.1
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-10 22:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-09 20:09 [Buildroot] [PATCH] package/uclibc: restore __isctype_l definition Max Filippov
2020-02-09 21:34 ` Yann E. MORIN
2020-03-10 22:20 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.