[ptxdist] [PATCH] host-localedef: explicitly set libc_cv_complocaledir

[ptxdist] [PATCH] host-localedef: explicitly set libc_cv_complocaledir

[Lucas Stach]

The default for the locale archive path is currently autodetected at
configure time and baked into the localedef binary with no way to
change it at runtime. On multilib hosts the detected path may end up
being different from what scripts/make_locale.sh expects.

Explicitly set libc_cv_complocaledir to the path expected elsewhere in
the system.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/host-localedef.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/host-localedef.make b/rules/host-localedef.make
index d39a8ed951e3..54568567f781 100644
--- a/rules/host-localedef.make
+++ b/rules/host-localedef.make
@@ -29,6 +29,10 @@ HOST_LOCALEDEF_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-or-later
 # Prepare
 # ----------------------------------------------------------------------------
 
+HOST_LOCALEDEF_CONF_ENV  := \
+	$(HOST_ENV) \
+	libc_cv_complocaledir='/usr/lib/locale'
+
 #
 # autoconf
 #
-- 
2.39.2

Re: [ptxdist] [APPLIED] host-localedef: explicitly set libc_cv_complocaledir

[Michael Olbrich]

Thanks, applied as be4f5ee4920c19c8e2963f9cf7b9e0851c03ba52.

Michael

[sent from post-receive hook]

On Wed, 17 May 2023 18:14:28 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> The default for the locale archive path is currently autodetected at
> configure time and baked into the localedef binary with no way to
> change it at runtime. On multilib hosts the detected path may end up
> being different from what scripts/make_locale.sh expects.
> 
> Explicitly set libc_cv_complocaledir to the path expected elsewhere in
> the system.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20230508124756.243441-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-localedef.make b/rules/host-localedef.make
> index d39a8ed951e3..54568567f781 100644
> --- a/rules/host-localedef.make
> +++ b/rules/host-localedef.make
> @@ -29,6 +29,10 @@ HOST_LOCALEDEF_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-or-later
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> +HOST_LOCALEDEF_CONF_ENV  := \
> +	$(HOST_ENV) \
> +	libc_cv_complocaledir='/usr/lib/locale'
> +
>  #
>  # autoconf
>  #