Skip to contentSkip to conversation

uclibc: update to 1.0.33

PATCH New Waldemar Brodkorb 3 participants 4 messages Mar 9, 2020 – Mar 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 uclibc: update to 1.0.33

---
v1 -> v2: repack tarballs with GNU tar

---
 ...lude-ctype.h-drop-is-_l-macro-definitions.patch | 72 ----------------------
 ...de-ctype.h-restore-__isctype_l-definition.patch | 32 ----------
 package/uclibc/uclibc.hash                         |  4 +-
 package/uclibc/uclibc.mk                           |  2 +-
 4 files changed, 3 insertions(+), 107 deletions(-)
 delete mode 100644 package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
 delete mode 100644 package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch
package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch deleted +0 -72
deleted file mode 100644
index 5557a9c1e7..0000000000
@@ -1,72 +0,0 @@
-From d1a3ca7ca56630fddde7311a0474eed4a21335a7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <[email protected]>
-Date: Mon, 3 Feb 2020 13:57:32 -0800
-Subject: [PATCH] include/ctype.h: drop is*_l macro definitions
-
-ctype locale-specific macro definitions are broken because they result
-in dereference of pointer to structure of incomplete type.
-Drop these macros since they are optional and let applications use
-functions with the same names.
-
-This change fixes parted-3.3 build with uClibc-ng:
-  http://autobuild.buildroot.net/results/b7ba1210d5aa184b133f0171da621d2b0083ec39/build-end.log
-
-Signed-off-by: Max Filippov <[email protected]>
----
- include/ctype.h | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
-
-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)
- /* Return the uppercase version of C.  */
- extern int toupper_l (int __c, __locale_t __l) __THROW;
- 
--# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
--#  define tolower_l(c, locale) __tobody(c, tolower_l, (locale)->__ctype_tolower, (c, locale))
--#  define toupper_l(c, locale) __tobody(c, toupper_l, (locale)->__ctype_toupper, (c, locale))
--# endif	/* Optimizing gcc */
--
--
--# 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))
--#  define __iscntrl_l(c,l)	__isctype_l((c), _IScntrl, (l))
--#  define __isdigit_l(c,l)	__isctype_l((c), _ISdigit, (l))
--#  define __islower_l(c,l)	__isctype_l((c), _ISlower, (l))
--#  define __isgraph_l(c,l)	__isctype_l((c), _ISgraph, (l))
--#  define __isprint_l(c,l)	__isctype_l((c), _ISprint, (l))
--#  define __ispunct_l(c,l)	__isctype_l((c), _ISpunct, (l))
--#  define __isspace_l(c,l)	__isctype_l((c), _ISspace, (l))
--#  define __isupper_l(c,l)	__isctype_l((c), _ISupper, (l))
--#  define __isxdigit_l(c,l)	__isctype_l((c), _ISxdigit, (l))
--#  define __isblank_l(c,l)	__isctype_l((c), _ISblank, (l))
--
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
- #   define __isascii_l(c,l)	((l), __isascii (c))
- #   define __toascii_l(c,l)	((l), __toascii (c))
- #  endif
- 
--#  define isalnum_l(c,l)	__isalnum_l ((c), (l))
--#  define isalpha_l(c,l)	__isalpha_l ((c), (l))
--#  define iscntrl_l(c,l)	__iscntrl_l ((c), (l))
--#  define isdigit_l(c,l)	__isdigit_l ((c), (l))
--#  define islower_l(c,l)	__islower_l ((c), (l))
--#  define isgraph_l(c,l)	__isgraph_l ((c), (l))
--#  define isprint_l(c,l)	__isprint_l ((c), (l))
--#  define ispunct_l(c,l)	__ispunct_l ((c), (l))
--#  define isspace_l(c,l)	__isspace_l ((c), (l))
--#  define isupper_l(c,l)	__isupper_l ((c), (l))
--#  define isxdigit_l(c,l)	__isxdigit_l ((c), (l))
--#  define isblank_l(c,l)	__isblank_l ((c), (l))
--
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
- #   define isascii_l(c,l)	__isascii_l ((c), (l))
--- 
-2.20.1
-
package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch deleted +0 -32
deleted file mode 100644
index a0e115c763..0000000000
@@ -1,32 +0,0 @@
-From 7a9a3e4b36955e8530756823d3443f6822562c56 Mon Sep 17 00:00:00 2001
-From: Max Filippov <[email protected]>
-Date: Sun, 9 Feb 2020 22:29:53 +0100
-Subject: [PATCH] include/ctype.h: restore __isctype_l definition
-
-Recent is*_l fix broke uclibc build because removed __isctype_l
-definition was used in libc/misc/ctype/ctype.c. Restore it.
-
-Fixes: d1a3ca7ca566 ("include/ctype.h: drop is*_l macro definitions")
-Signed-off-by: Max Filippov <[email protected]>
----
-Upstream status:
-https://mailman.uclibc-ng.org/pipermail/devel/2020-February/001940.html
----
- include/ctype.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/ctype.h b/include/ctype.h
-index e934cf332..05f21c553 100644
---- a/include/ctype.h
-+++ b/include/ctype.h
-@@ -350,6 +350,7 @@ libc_hidden_proto(tolower_l)
- /* Return the uppercase version of C.  */
- extern int toupper_l (int __c, __locale_t __l) __THROW;
- 
-+# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
- # ifndef __NO_CTYPE
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
--- 
-2.20.1
-
package/uclibc/uclibc.hash +2 -2
index c1f161fa15..25629e6493 100644
@@ -1,4 +1,4 @@
-# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256
-sha256  891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370  uClibc-ng-1.0.32.tar.xz
+# From https://downloads.uclibc-ng.org/releases/1.0.33/uClibc-ng-1.0.33.tar.xz.sha256
+sha256  aa7c361fddddf90b40a90e04431e607e2da21a5e8e2840a6db9ffd0c89d03e0d  uClibc-ng-1.0.33.tar.xz
 # Locally calculated
 sha256  6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3  COPYING.LIB
package/uclibc/uclibc.mk +1 -1
index 2af666c208..3975e7e743 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.32
+UCLIBC_VERSION = 1.0.33
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPL-2.1+
Signature · 1 line
2.11.0
#1 lore raw

PATCH v2 1/1 uclibc: update to 1.0.33

Quoted 3 lines · On Mon, 9 Mar 2020 11:18:10 +0100 Waldemar Brodkorb <[email protected]> wrote:

---
v1 -> v2: repack tarballs with GNU tar

So you re-uploaded a different tarball, but with the same name ?

Not nice for those who had stored a hash of your previous tarball :-/

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 uclibc: update to 1.0.33

In reply to Waldemar Brodkorb

Hi Weldemar,

Le 09/03/2020 ? 11:18, Waldemar Brodkorb a ?crit?:

Quoted 1 line

I used the Buildroot gitlab ci to test the uClibc-ng update

It seems we need to fix something in qt5base package:
.obj/qfilesystemengine_unix.o: in function `qt_real_statx(int, char const*, int, statx*)':
qfilesystemengine_unix.cpp:(.text+0x5c): undefined reference to `statx'

https://gitlab.com/kubu93/buildroot/-/jobs/472027985

It seems related to [1] but we don't have such issue with glibc (2.29 & 2.30).

[1]
https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=8a04c4d84c8a1a1297ec0c5cec5522112981e0c0

Best regards,
Romain

Quoted 152 lines

---
v1 -> v2: repack tarballs with GNU tar

---
 ...lude-ctype.h-drop-is-_l-macro-definitions.patch | 72 ----------------------
 ...de-ctype.h-restore-__isctype_l-definition.patch | 32 ----------
 package/uclibc/uclibc.hash                         |  4 +-
 package/uclibc/uclibc.mk                           |  2 +-
 4 files changed, 3 insertions(+), 107 deletions(-)
 delete mode 100644 package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
 delete mode 100644 package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch
package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch deleted +0 -72
deleted file mode 100644
index 5557a9c1e7..0000000000
@@ -1,72 +0,0 @@
-From d1a3ca7ca56630fddde7311a0474eed4a21335a7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <[email protected]>
-Date: Mon, 3 Feb 2020 13:57:32 -0800
-Subject: [PATCH] include/ctype.h: drop is*_l macro definitions
-
-ctype locale-specific macro definitions are broken because they result
-in dereference of pointer to structure of incomplete type.
-Drop these macros since they are optional and let applications use
-functions with the same names.
-
-This change fixes parted-3.3 build with uClibc-ng:
-  http://autobuild.buildroot.net/results/b7ba1210d5aa184b133f0171da621d2b0083ec39/build-end.log
-
-Signed-off-by: Max Filippov <[email protected]>
----
- include/ctype.h | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
-
-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)
- /* Return the uppercase version of C.  */
- extern int toupper_l (int __c, __locale_t __l) __THROW;
- 
--# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
--#  define tolower_l(c, locale) __tobody(c, tolower_l, (locale)->__ctype_tolower, (c, locale))
--#  define toupper_l(c, locale) __tobody(c, toupper_l, (locale)->__ctype_toupper, (c, locale))
--# endif	/* Optimizing gcc */
--
--
--# 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))
--#  define __iscntrl_l(c,l)	__isctype_l((c), _IScntrl, (l))
--#  define __isdigit_l(c,l)	__isctype_l((c), _ISdigit, (l))
--#  define __islower_l(c,l)	__isctype_l((c), _ISlower, (l))
--#  define __isgraph_l(c,l)	__isctype_l((c), _ISgraph, (l))
--#  define __isprint_l(c,l)	__isctype_l((c), _ISprint, (l))
--#  define __ispunct_l(c,l)	__isctype_l((c), _ISpunct, (l))
--#  define __isspace_l(c,l)	__isctype_l((c), _ISspace, (l))
--#  define __isupper_l(c,l)	__isctype_l((c), _ISupper, (l))
--#  define __isxdigit_l(c,l)	__isctype_l((c), _ISxdigit, (l))
--#  define __isblank_l(c,l)	__isctype_l((c), _ISblank, (l))
--
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
- #   define __isascii_l(c,l)	((l), __isascii (c))
- #   define __toascii_l(c,l)	((l), __toascii (c))
- #  endif
- 
--#  define isalnum_l(c,l)	__isalnum_l ((c), (l))
--#  define isalpha_l(c,l)	__isalpha_l ((c), (l))
--#  define iscntrl_l(c,l)	__iscntrl_l ((c), (l))
--#  define isdigit_l(c,l)	__isdigit_l ((c), (l))
--#  define islower_l(c,l)	__islower_l ((c), (l))
--#  define isgraph_l(c,l)	__isgraph_l ((c), (l))
--#  define isprint_l(c,l)	__isprint_l ((c), (l))
--#  define ispunct_l(c,l)	__ispunct_l ((c), (l))
--#  define isspace_l(c,l)	__isspace_l ((c), (l))
--#  define isupper_l(c,l)	__isupper_l ((c), (l))
--#  define isxdigit_l(c,l)	__isxdigit_l ((c), (l))
--#  define isblank_l(c,l)	__isblank_l ((c), (l))
--
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
- #   define isascii_l(c,l)	__isascii_l ((c), (l))
--- 
-2.20.1
-
package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch deleted +0 -32
deleted file mode 100644
index a0e115c763..0000000000
@@ -1,32 +0,0 @@
-From 7a9a3e4b36955e8530756823d3443f6822562c56 Mon Sep 17 00:00:00 2001
-From: Max Filippov <[email protected]>
-Date: Sun, 9 Feb 2020 22:29:53 +0100
-Subject: [PATCH] include/ctype.h: restore __isctype_l definition
-
-Recent is*_l fix broke uclibc build because removed __isctype_l
-definition was used in libc/misc/ctype/ctype.c. Restore it.
-
-Fixes: d1a3ca7ca566 ("include/ctype.h: drop is*_l macro definitions")
-Signed-off-by: Max Filippov <[email protected]>
----
-Upstream status:
-https://mailman.uclibc-ng.org/pipermail/devel/2020-February/001940.html
----
- include/ctype.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/ctype.h b/include/ctype.h
-index e934cf332..05f21c553 100644
---- a/include/ctype.h
-+++ b/include/ctype.h
-@@ -350,6 +350,7 @@ libc_hidden_proto(tolower_l)
- /* Return the uppercase version of C.  */
- extern int toupper_l (int __c, __locale_t __l) __THROW;
- 
-+# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
- # ifndef __NO_CTYPE
- #  if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \
- 	&& defined __UCLIBC_SUSV4_LEGACY__
--- 
-2.20.1
-
package/uclibc/uclibc.hash +2 -2
index c1f161fa15..25629e6493 100644
@@ -1,4 +1,4 @@
-# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256
-sha256  891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370  uClibc-ng-1.0.32.tar.xz
+# From https://downloads.uclibc-ng.org/releases/1.0.33/uClibc-ng-1.0.33.tar.xz.sha256
+sha256  aa7c361fddddf90b40a90e04431e607e2da21a5e8e2840a6db9ffd0c89d03e0d  uClibc-ng-1.0.33.tar.xz
 # Locally calculated
 sha256  6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3  COPYING.LIB
package/uclibc/uclibc.mk +1 -1
index 2af666c208..3975e7e743 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.32
+UCLIBC_VERSION = 1.0.33
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPL-2.1+
#3 lore raw

PATCH v2 1/1 uclibc: update to 1.0.33

Quoted 12 lines · On Sun, 15 Mar 2020 16:46:42 +0100 Romain Naour <[email protected]> wrote:

Hi Weldemar,

Le 09/03/2020 ? 11:18, Waldemar Brodkorb a ?crit?:

Quoted 1 line

I used the Buildroot gitlab ci to test the uClibc-ng update

It seems we need to fix something in qt5base package:
.obj/qfilesystemengine_unix.o: in function `qt_real_statx(int, char const*, int, statx*)':
qfilesystemengine_unix.cpp:(.text+0x5c): undefined reference to `statx'

Quoted 6 lines

https://gitlab.com/kubu93/buildroot/-/jobs/472027985

It seems related to [1] but we don't have such issue with glibc (2.29 & 2.30).

[1]
https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=8a04c4d84c8a1a1297ec0c5cec5522112981e0c0

Thanks for the testing. Due to this issue, I'm holding off on the update to uClibc-ng 1.0.33. Waldemar, will you have a look ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com