From 85448febb3c9f21e6e4082fc344b3ef46261c782 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Aug 2014 23:05:23 +0200 Subject: [PATCH] package/localedef: don't use config.site when cross-compiling On fedora 20 64bits host, the file /usr/share/config.site contains a fix for installing libraries into /lib/lib64 on 64bits systems that redefine libdir in the generated Makefile. This causes the bug 7262 reported Normen Bolling. Set CONFIG_SITE to "no" to not use config.site fixes: https://bugs.busybox.net/show_bug.cgi?id=7262 Reported-by: Normen Bolling Cc: Normen Bolling Cc: Thomas De Schampheleire Signed-off-by: Romain Naour Tested-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/localedef/localedef.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 17ffd14c0..9a7118a29 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -8,6 +8,10 @@ LOCALEDEF_VERSION = 2.14.1-r17443-ptx1 LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2 LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src +# Avoid loading /usr/share/config.site that can redefine libdir when +# the host arch is a 64bit system. +HOST_LOCALEDEF_CONF_ENV = CONFIG_SITE="no" + HOST_LOCALEDEF_CONF_OPT += \ --prefix=/usr \ --with-glibc=./eglibc