mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-29 13:31:43 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/{glibc, localedef}: bump version to 2.43-10-gc3ceb93dc4

Browse Source 
Updated license files and hashes due to upstream commit:
https://sourceware.org/git/?p=glibc.git;a=commit;h=a0ce8b0779e290596e99ca6d96c301684a2d7cfe

Rebased patches 0001-0003.

Added patch 0004 to fix build on hosts with glibc < 2.40 due to
upstream commits:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f28a11e43f40df2ad92ece62b28ee004a8ad600b
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=42cc619dfbc44e263239c2de870bae11ad65810a

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: add info in commit log and patch 0004]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-03-07 10:27:01 +01:00
committed by Julien Olivain
parent ca02e86f88
commit 227378b593
7 changed files with 83 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/glibc/glibc.hash
View File

@@ -1,7 +1,7 @@
# Locally calculated (fetched from git)
sha256 737e3b2bfee2e3e209e514133f4ff7d2bef0d0dc903fd46b4e2244f6c998f7b2 glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz
sha256 5e21722755f466d15770574788394a4abb4fb1e02603a707beeb199706a26a46 glibc-2.43-10-gc3ceb93dc4f67253037644dc8f194831e27f3160-git4.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYINGv2
sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING.LESSERv2
sha256 b22a69aa3f80a5201818c66cb0df0f25f9fa13cf5861b0093a058dbd12d50dce LICENSES

4
package/glibc/glibc.mk
View File

@@ -7,12 +7,12 @@
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
# When updating the version, please also update localedef
GLIBC_VERSION = 2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
GLIBC_VERSION = 2.43-10-gc3ceb93dc4f67253037644dc8f194831e27f3160
GLIBC_SITE = https://sourceware.org/git/glibc.git
GLIBC_SITE_METHOD = git
GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)
GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES
GLIBC_LICENSE_FILES = COPYINGv2 COPYING.LESSERv2 LICENSES
GLIBC_CPE_ID_VENDOR = gnu
# Extract the base version (e.g. 2.38) from GLIBC_VERSION in order to

8
package/localedef/0001-HACK-only-build-and-install-localedef.patch
View File

@@ -11,16 +11,18 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Romain Naour <romain.naour@gmail.com>
[yann.morin.1998@free.fr: rebase for 2.39]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
[Bernd: rebase for 2.43]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Rules | 14 ++++++++++----
locale/Makefile | 3 ---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Rules b/Rules
index 44c041c491..156c82619b 100644
index b07400a979..4ce2180b49 100644
--- a/Rules
+++ b/Rules
@@ -239,10 +239,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
@@ -247,10 +247,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
$(binaries-all-notests))
ifneq "$(strip $(binaries-shared-notests))" ""
@@ -42,7 +44,7 @@ index 44c041c491..156c82619b 100644
ifneq "$(strip $(binaries-shared-tests))" ""
diff --git a/locale/Makefile b/locale/Makefile
index 9d9c1a7691..4d26032c15 100644
index fc38c02114..c00bc085b4 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -76,7 +76,6 @@ aux = \

10
package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
View File

@@ -30,15 +30,17 @@ Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Romain Naour <romain.naour@gmail.com>
[yann.morin.1998@free.fr: rebase for 2.39]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
[Bernd: rebase for 2.43]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 180e49d95b..fdb19d1d27 100755
index 0cd2269859..1c7e42ec10 100755
--- a/configure
+++ b/configure
@@ -5352,7 +5352,7 @@ printf %s "checking version of $LD... " >&6; }
@@ -5350,7 +5350,7 @@ printf %s "checking version of $LD... " >&6; }
ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -47,11 +49,11 @@ index 180e49d95b..fdb19d1d27 100755
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -5801,7 +5801,7 @@ int
@@ -5799,7 +5799,7 @@ int
main (void)
{
-#if !defined __GNUC__ || __GNUC__ < 12 || (__GNUC__ == 12 && __GNUC_MINOR__ < 1)
-#if (!defined __GNUC__ || __GNUC__ < 12 || (__GNUC__ == 12 && __GNUC_MINOR__ < 1)) && (!defined __clang__ || __clang_major__ < 18)
+#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
#error insufficient compiler
#endif

6
package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch
View File

@@ -14,15 +14,17 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
[Thomas: adapted to glibc 2.40, which required the logic to be changed
to _ISOC23_SOURCE]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Bernd: rebase for 2.43]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
include/features.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/features.h b/include/features.h
index 8515b06b36..9abd65af93 100644
index c080ad4260..230fd2539a 100644
--- a/include/features.h
+++ b/include/features.h
@@ -217,9 +217,7 @@
@@ -223,9 +223,7 @@
# undef _ISOC11_SOURCE
# define _ISOC11_SOURCE 1
# undef _ISOC23_SOURCE

62
package/localedef/0004-HACK-use-TIME_-MONOTONIC-ACTIVE-THREAD_ACTIVE-withou.patch Normal file
View File

@@ -0,0 +1,62 @@
From 34e68bbb6631320bf2b64a00467fb5e59065bd43 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Fri, 6 Mar 2026 20:59:28 +0100
Subject: [PATCH] HACK: use TIME_[MONOTONIC|ACTIVE|THREAD_ACTIVE] without
_ISOC23_SOURCE to build localedef with glibc < 2.40
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The Buildroot host-localdef package is built when
BR2_GENERATE_LOCALE has a value defined.
localdef is a tool from the glibc package, and is normally
meant to be built with the glibc version it is included in.
When Buildroot builds host-localedef, it will use the host glibc.
When the host glibc version is < 2.40, the compilation fails with
error:
../include/time.h:545:11: error: ‘TIME_MONOTONIC’ undeclared
(first use in this function); did you mean ‘CLOCK_MONOTONIC’?
../include/time.h:546:11: error: ‘TIME_ACTIVE’ undeclared
(first use in this function); did you mean ‘TIMER_ABSTIME’?
../include/time.h:547:11: error: ‘TIME_THREAD_ACTIVE’ undeclared
(first use in this function)
This error happen for example in the Buildroot Docker image
(which is a Debian 12, glibc 2.36).
This is because glibc < 2.40 does not define _ISOC23_SOURCE, which
was added in upstream commit [1], and the previous Buildroot localedef
package patch which also removes the _ISOC23_SOURCE definition.
This patch workaround the situation by removing the condition around
the missing definitions.
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=42cc619dfbc44e263239c2de870bae11ad65810a
Upstream: Not applicable
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: add extra info in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
time/time.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/time/time.h b/time/time.h
index ae7beccb72..0a2e8e741f 100644
--- a/time/time.h
+++ b/time/time.h
@@ -67,8 +67,6 @@ typedef __pid_t pid_t;
#ifdef __USE_ISOC11
/* Time base values for timespec_get. */
# define TIME_UTC 1
-#endif
-#if __GLIBC_USE (ISOC23)
# define TIME_MONOTONIC 2
# define TIME_ACTIVE 3
# define TIME_THREAD_ACTIVE 4
--
2.53.0

2
package/localedef/localedef.mk
View File

@@ -7,7 +7,7 @@
# Use the same VERSION and SITE as target glibc
# As in glibc.mk, generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
LOCALEDEF_VERSION = 2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
LOCALEDEF_VERSION = 2.43-10-gc3ceb93dc4f67253037644dc8f194831e27f3160
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION)$(BR_FMT_VERSION_git).tar.gz
LOCALEDEF_SITE = https://sourceware.org/git/glibc.git
LOCALEDEF_SITE_METHOD = git