From 65849bd96d0de501c109c32fab01a5eb1fd3a629 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Apr 2023 22:31:13 +0200 Subject: [PATCH] package/localedef: fix fallout after bump to glibc 2.37 Commit a379499f7334 (package/glibc: bump to version 2.37) forgot to update the pach for localedef. There is no version check for 'as' now, so drop the related hunk. Fixes: a379499f7334c2a68d375b1cf9dc35cd59884181 Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Sebastian Weyer Cc: Bagas Sanjaya Tested-by: Sebastian Weyer --- ...dency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index 297c96cc5e..94fccfa856 100644 --- a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -24,6 +24,8 @@ GCC 6.2+ https://sourceware.org/git/?p=glibc.git;a=commit;h=4dcbbc3b28aaeafe23e1a30db84055aa6f6fa987 Signed-off-by: Matthew Weber +[yann.morin.1998@free.fr: update for 2.37] +Signed-off-by: Yann E. MORIN --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -32,16 +34,7 @@ diff --git a/configure b/configure index 9619c10991..0c481d2339 100755 --- a/configure +++ b/configure -@@ -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;; -- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) -+ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -4781,7 +4781,7 @@ $as_echo_n "checking version of $LD... " >&6; } +@@ -4178,7 +4178,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 +43,7 @@ index 9619c10991..0c481d2339 100755 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -@@ -5189,7 +5189,7 @@ int +@@ -4589,7 +4589,7 @@ int main () {