Re: [ptxdist] [APPLIED] host-localedef: Version bump. 2.27 -> 2.36.

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as b79aaf3ff9386f675324a21c4a53ebda734c39a2.

Michael

[sent from post-receive hook]

On Thu, 15 Dec 2022 08:34:57 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Not much of interest here.
> Bump localedef from glibc 2.27 to 2.36.
> Might aswell, in case bugs in locale generation were fixed.
> 
> * Forward and fix patch series so that they apply properly.
> * Newer glibc seem to require host-system python.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221205184019.2133659-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch b/patches/localedef-glibc-2.36/0001-HACK-only-build-and-install-localedef.patch
> similarity index 86%
> rename from patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch
> rename to patches/localedef-glibc-2.36/0001-HACK-only-build-and-install-localedef.patch
> index 9ad678c96616..8e9f7d67940f 100644
> --- a/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch
> +++ b/patches/localedef-glibc-2.36/0001-HACK-only-build-and-install-localedef.patch
> @@ -9,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   2 files changed, 13 insertions(+), 7 deletions(-)
>  
>  diff --git a/Rules b/Rules
> -index 706c8a749dfb..04f3f333cd06 100644
> +index ac9455d6a707..da4e76523d6f 100644
>  --- a/Rules
>  +++ b/Rules
> -@@ -188,10 +188,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
> +@@ -224,10 +224,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
>   				       $(binaries-all-notests))
>   
>   ifneq "$(strip $(binaries-shared-notests))" ""
> @@ -34,10 +34,10 @@ index 706c8a749dfb..04f3f333cd06 100644
>   
>   ifneq "$(strip $(binaries-shared-tests))" ""
>  diff --git a/locale/Makefile b/locale/Makefile
> -index fd9972279ba7..a8541593295f 100644
> +index eb55750496e1..0fe80c31cb36 100644
>  --- a/locale/Makefile
>  +++ b/locale/Makefile
> -@@ -32,13 +32,13 @@ categories	= ctype messages monetary numeric time paper name \
> +@@ -33,15 +33,15 @@ categories	= ctype messages monetary numeric time paper name \
>   		  address telephone measurement identification collate
>   aux		= $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
>   		  xlocale localename global-locale coll-lookup
> @@ -48,6 +48,8 @@ index fd9972279ba7..a8541593295f 100644
>  +install-bin	= localedef
>   extra-objs	= $(localedef-modules:=.o) $(localedef-aux:=.o) \
>   		  $(locale-modules:=.o) $(lib-modules:=.o)
> + generated 	+= C-translit.h
> + before-compile	+= $(objpfx)C-translit.h
>   
>  -extra-libs	= libBrokenLocale
>  +#extra-libs	= libBrokenLocale
> diff --git a/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch b/patches/localedef-glibc-2.36/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch
> similarity index 91%
> rename from patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch
> rename to patches/localedef-glibc-2.36/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch
> index 00f10302b86a..c5230a63d13c 100644
> --- a/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch
> +++ b/patches/localedef-glibc-2.36/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch
> @@ -14,10 +14,10 @@ Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c
> -index df0257b6c075..aef618c86363 100644
> +index 214b47b396b1..74b51aae2b01 100644
>  --- a/locale/programs/ld-identification.c
>  +++ b/locale/programs/ld-identification.c
> -@@ -194,8 +194,8 @@ No definition for %s category found"), "LC_IDENTIFICATION");
> +@@ -193,8 +193,8 @@ No definition for %s category found"), "LC_IDENTIFICATION");
>   	      matched = true;
>   
>   	  if (matched != true)
> diff --git a/patches/localedef-glibc-2.27/series b/patches/localedef-glibc-2.36/series
> similarity index 100%
> rename from patches/localedef-glibc-2.27/series
> rename to patches/localedef-glibc-2.36/series
> diff --git a/rules/host-localedef.in b/rules/host-localedef.in
> index e0f3f62990e3..16380f6ba5ed 100644
> --- a/rules/host-localedef.in
> +++ b/rules/host-localedef.in
> @@ -1,5 +1,6 @@
>  ## SECTION=hosttools_noprompt
>  
>  config HOST_LOCALEDEF
> +	select HOST_SYSTEM_PYTHON3
>  	tristate
>  	default y if ALLYES
> diff --git a/rules/host-localedef.make b/rules/host-localedef.make
> index bc9d7442ae28..90ad9ea3ff2a 100644
> --- a/rules/host-localedef.make
> +++ b/rules/host-localedef.make
> @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_LOCALEDEF) += host-localedef
>  #
>  # Paths and names
>  #
> -HOST_LOCALEDEF_VERSION	:= 2.27
> -HOST_LOCALEDEF_MD5	:= 274e794c999b4ebbccdf72bfb4c49a68
> +HOST_LOCALEDEF_VERSION	:= 2.36
> +HOST_LOCALEDEF_MD5	:= fa3409fd10d880163231d7a5b060255c
>  HOST_LOCALEDEF		:= localedef-glibc-$(HOST_LOCALEDEF_VERSION)
>  HOST_LOCALEDEF_SUFFIX	:= tar.bz2
>  HOST_LOCALEDEF_URL	:= $(call ptx/mirror, GNU, glibc/glibc-$(HOST_LOCALEDEF_VERSION).$(HOST_LOCALEDEF_SUFFIX))