[Buildroot] [git commit branch/2025.02.x] package/uclibc: update to 1.0.52
Thomas Perale
thomas.perale at mind.be
Wed Apr 16 08:44:36 UTC 2025
commit: https://git.buildroot.net/buildroot/commit/?id=b3ba70b20d43aed65aad4a2448256670454232da
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2025.02.x
See here for release notes:
https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/AGJRU33MT2GMXFNOUDXHISFQIVRYRYXO/
Drop patches 0001/0002 which are upstream.
Signed-off-by: Waldemar Brodkorb <wbx at openadk.org>
Signed-off-by: Julien Olivain <ju.o at free.fr>
(cherry picked from commit 7dda4b57518ef554a48fd90c4df060dfd85441fe)
Signed-off-by: Thomas Perale <thomas.perale at mind.be>
---
...lib.h-only-expose-reallocarray-prototype-.patch | 64 ---------------
.../0002-m68k-fix-alignment-in-NPTL-code.patch | 92 ----------------------
package/uclibc/uclibc.hash | 4 +-
package/uclibc/uclibc.mk | 2 +-
4 files changed, 3 insertions(+), 159 deletions(-)
diff --git a/package/uclibc/0001-include-stdlib.h-only-expose-reallocarray-prototype-.patch b/package/uclibc/0001-include-stdlib.h-only-expose-reallocarray-prototype-.patch
deleted file mode 100644
index 867e3645cc..0000000000
--- a/package/uclibc/0001-include-stdlib.h-only-expose-reallocarray-prototype-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From bbb1a4f197624b0040e3228505eb2a725a8846f8 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
-Date: Thu, 3 Apr 2025 22:56:49 +0200
-Subject: [PATCH] include/stdlib.h: only expose reallocarray() prototype when
- implementation is available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The reallocarray() primitive is only provided by the malloc-standard
-implementation: neither malloc nor malloc-simple provide it. This
-causes issues when building for example util-linux on noMMU platforms
-as:
-
-- noMMU platforms can't use malloc-standard, so either malloc or
- malloc-simple are used, which means reallocarray() is not
- implemented
-
-- util-linux detects the absence of reallocarray(), and provides its
- own implementation, but the prototype clashes with the prototype in
- uClibc's <stdlib.h>
-
-The combination of which causes the following build failure:
-
-In file included from lib/color-names.c:7:
-./include/c.h:586:21: error: static declaration of ‘reallocarray’ follows non-static declaration
- 586 | static inline void *reallocarray(void *ptr, size_t nmemb, size_t size)
- | ^~~~~~~~~~~~
-In file included from ./include/c.h:16:
-/home/thomas/projets/buildroot/output/host/arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/include/stdlib.h:898:14: note: previous declaration of ‘reallocarray’ with type ‘void *(void *, size_t, size_t)’ {aka ‘void *(void *, unsigned int, unsigned int)’}
- 898 | extern void *reallocarray (void *__ptr, size_t __m, size_t __n);
- | ^~~~~~~~~~~~
-make[3]: *** [Makefile:12354: lib/libtcolors_la-color-names.lo] Error 1
-
-To fix this, let's not expose the prototype of reallocarray() if we
-don't provide the implementation for it.
-
-Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/BX4ENNZYO23YQJQF5XITW7TETSJHEFK5/
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
----
- include/stdlib.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/stdlib.h b/include/stdlib.h
-index d4e0b75e7..448c5e336 100644
---- a/include/stdlib.h
-+++ b/include/stdlib.h
-@@ -986,9 +986,13 @@ extern int getpt (void);
- extern int getloadavg (double __loadavg[], int __nelem)
- __THROW __nonnull ((1));
-
-+/* reallocarray() only provided by the malloc-standard implementation */
-+#if defined(__MALLOC_STANDARD__)
- extern void *reallocarray (void *__ptr, size_t __m, size_t __n);
- #endif
-
-+#endif
-+
- #ifdef _LIBC
- extern int __drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer) attribute_hidden;
-
---
-2.48.1
-
diff --git a/package/uclibc/0002-m68k-fix-alignment-in-NPTL-code.patch b/package/uclibc/0002-m68k-fix-alignment-in-NPTL-code.patch
deleted file mode 100644
index fbd9934376..0000000000
--- a/package/uclibc/0002-m68k-fix-alignment-in-NPTL-code.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 278ac6b3098315cddec8f71f27bd8de22e53ca6c Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg at debian.org>
-Date: Wed, 12 Mar 2025 22:11:51 +0100
-Subject: [PATCH] m68k: fix alignment in NPTL code
-
-Upstream: https://gogs.waldemar-brodkorb.de/oss/uclibc-ng/commit/278ac6b3098315cddec8f71f27bd8de22e53ca6c
-Signed-off-by: Thorsten Glaser <tg at debian.org>
-Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois at yoseli.org>
----
- .../unix/sysv/linux/m68k/bits/pthreadtypes.h | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h b/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
-index 2a90a0b90..d2f22caee 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
-@@ -39,7 +39,7 @@ typedef unsigned long int pthread_t;
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_ATTR_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_attr_t;
-
-
-@@ -69,13 +69,13 @@ typedef union
- };
- } __data;
- char __size[__SIZEOF_PTHREAD_MUTEX_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_mutex_t;
-
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_mutexattr_t;
-
-
-@@ -95,13 +95,13 @@ typedef union
- unsigned int __broadcast_seq;
- } __data;
- char __size[__SIZEOF_PTHREAD_COND_T];
-- __extension__ long long int __align;
-+ __extension__ long long int __align __attribute__((__aligned__(8)));
- } pthread_cond_t;
-
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_CONDATTR_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_condattr_t;
-
-
-@@ -144,13 +144,13 @@ typedef union
- int __writer;
- } __data;
- char __size[__SIZEOF_PTHREAD_RWLOCK_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_rwlock_t;
-
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_RWLOCKATTR_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_rwlockattr_t;
- #endif
-
-@@ -165,13 +165,13 @@ typedef volatile int pthread_spinlock_t;
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_BARRIER_T];
-- long int __align;
-+ long int __align __attribute__((__aligned__(4)));
- } pthread_barrier_t;
-
- typedef union
- {
- char __size[__SIZEOF_PTHREAD_BARRIERATTR_T];
-- int __align;
-+ int __align __attribute__((__aligned__(4)));
- } pthread_barrierattr_t;
- #endif
-
---
-2.39.5
-
diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash
index 398a1c04c4..35a4b4b962 100644
--- a/package/uclibc/uclibc.hash
+++ b/package/uclibc/uclibc.hash
@@ -1,4 +1,4 @@
-# From https://downloads.uclibc-ng.org/releases/1.0.51/uClibc-ng-1.0.51.tar.xz.sha256
-sha256 3484c8c7a0503c08f7e5fa7473c987414050726f31e8593d02d984f512d1a0cb uClibc-ng-1.0.51.tar.xz
+# From https://downloads.uclibc-ng.org/releases/1.0.52/uClibc-ng-1.0.52.tar.xz.sha256
+sha256 881da473784f95cc8290bb0780c0afc810ca28d575e33d5afd5e7153b29aa136 uClibc-ng-1.0.52.tar.xz
# Locally calculated
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 12b597f03b..eb36de8e95 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UCLIBC_VERSION = 1.0.51
+UCLIBC_VERSION = 1.0.52
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
UCLIBC_LICENSE = LGPL-2.1+
More information about the buildroot
mailing list