[Buildroot] [git commit] package/localedef: bump to version 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Thu Aug 26 21:49:48 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=61730de4c0a83e7309bfd766df58c14410a543b3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
resync the version with glibc package.
Dropped 2 patches (fixes backported from previous releases),
rebased 2 which are kept (only line numbers changed).
Suggested-by: Romain Naour <romain.naour at gmail.com>
Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
[Arnout: resolve conflicts]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
.../0001-HACK-only-build-and-install-localedef.patch | 8 ++++----
...elax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 13 ++++++-------
.../localedef.hash | 2 +-
package/localedef/localedef.mk | 2 +-
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch
similarity index 92%
rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch
rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch
index 0dcecc1a70..b289000c8a 100644
--- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch
+++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch
@@ -1,4 +1,4 @@
-From 942f45364e7db805f0390c808ef656faa577a419 Mon Sep 17 00:00:00 2001
+From 442e9a3f262c49cf61f9e7bdf12882f0a427666b Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich at pengutronix.de>
Date: Mon, 21 May 2018 16:45:02 +0200
Subject: [PATCH] HACK: only build and install localedef
@@ -13,10 +13,10 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net>
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Rules b/Rules
-index 082625bb71..2603c96734 100644
+index b1137afe71..2aeac31922 100644
--- a/Rules
+++ b/Rules
-@@ -212,10 +212,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
+@@ -216,10 +216,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
$(binaries-all-notests))
ifneq "$(strip $(binaries-shared-notests))" ""
@@ -61,5 +61,5 @@ index b7c60681fa..de4cf4003f 100644
libBrokenLocale-routines = broken_cur_max
--
-2.31.1
+2.33.0
diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
similarity index 90%
rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
index 54c45650d5..297c96cc5e 100644
--- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
+++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
@@ -1,4 +1,4 @@
-From ec4ebe89a7636da63ccff349d0f0c9f38ac3e3e1 Mon Sep 17 00:00:00 2001
+From 85412262460f6ba9f6e2cf8da74fc1904c54c854 Mon Sep 17 00:00:00 2001
From: Matt Weber <matthew.weber at rockwellcollins.com>
Date: Thu, 6 Feb 2020 14:36:21 -0600
Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24
@@ -29,10 +29,10 @@ Signed-off-by: Matthew Weber <matthew.weber at rockwellcollins.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
-index 1dc3af60b4..e3ee4e9fd7 100755
+index 9619c10991..0c481d2339 100755
--- a/configure
+++ b/configure
-@@ -4587,7 +4587,7 @@ $as_echo_n "checking version of $AS... " >&6; }
+@@ -4651,7 +4651,7 @@ $as_echo_n "checking version of $AS... " >&6; }
ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -41,7 +41,7 @@ index 1dc3af60b4..e3ee4e9fd7 100755
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-@@ -4717,7 +4717,7 @@ $as_echo_n "checking version of $LD... " >&6; }
+@@ -4781,7 +4781,7 @@ $as_echo_n "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;;
@@ -50,7 +50,7 @@ index 1dc3af60b4..e3ee4e9fd7 100755
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-@@ -5126,7 +5126,7 @@ int
+@@ -5189,7 +5189,7 @@ int
main ()
{
@@ -60,5 +60,4 @@ index 1dc3af60b4..e3ee4e9fd7 100755
#endif
;
--
-2.31.1
-
+2.33.0
diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash
similarity index 70%
rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash
rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash
index 4b8d8297ec..595de95a58 100644
--- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash
+++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash
@@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
-sha256 3e2004b16ec6b79a19a88ed4736719ef9e419f9d8e7013faced654c0339e23dc glibc-2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f.tar.gz
+sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index d8dfdffaa2..87d921cffe 100644
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -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.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f
+LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
HOST_LOCALEDEF_DL_SUBDIR = glibc
More information about the buildroot
mailing list