diff mbox

[1/1] package/localedef: don't use config.site when cross-compiling

Message ID 1407963923-27432-1-git-send-email-romain.naour@openwide.fr
State Accepted
Headers show

Commit Message

Romain Naour Aug. 13, 2014, 9:05 p.m. UTC
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 <normen.bolling@teufel.de>
Cc: Normen Bolling <normen.bolling@teufel.de>
Cc: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/localedef/localedef.mk | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Thomas De Schampheleire Aug. 14, 2014, 7:19 p.m. UTC | #1
On Wed, Aug 13, 2014 at 11:05 PM, Romain Naour <romain.naour@openwide.fr> wrote:
> 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 <normen.bolling@teufel.de>
> Cc: Normen Bolling <normen.bolling@teufel.de>
> Cc: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>

Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

This patch should go in 2014.08.

Best regards,
Thomas
Thomas Petazzoni Aug. 15, 2014, 8:28 p.m. UTC | #2
Dear Romain Naour,

On Wed, 13 Aug 2014 23:05:23 +0200, Romain Naour wrote:
> 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 <normen.bolling@teufel.de>
> Cc: Normen Bolling <normen.bolling@teufel.de>
> Cc: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/localedef/localedef.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks.

Thomas
Romain Naour Aug. 17, 2014, 5:34 p.m. UTC | #3
Hi Thomas,

Le 15/08/2014 22:28, Thomas Petazzoni a écrit :
> Dear Romain Naour,
> 
> On Wed, 13 Aug 2014 23:05:23 +0200, Romain Naour wrote:
>> 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
>>

I noticed that other autotools packages continue to load the config.site file
from host.

"configure: loading site script /usr/share/config.site"

I don't know if other packets may be impacted by this issue ...

Maybe move CONFIG_SITE=no to pkg-autotools.mk ?

Best regards,
Romain
Thomas Petazzoni Aug. 17, 2014, 6:57 p.m. UTC | #4
Dear Romain Naour,

On Sun, 17 Aug 2014 19:34:15 +0200, Romain Naour wrote:

> I noticed that other autotools packages continue to load the config.site file
> from host.
> 
> "configure: loading site script /usr/share/config.site"
> 
> I don't know if other packets may be impacted by this issue ...
> 
> Maybe move CONFIG_SITE=no to pkg-autotools.mk ?

Yes, maybe we should do that.

Thomas
diff mbox

Patch

diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index 17ffd14..9a7118a 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