[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Romain Naour]

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

For safety, disable loading this file when running the configure
script for the target and the host.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/pkg-autotools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index bcc648d..cdc31bf 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
 	$$(TARGET_CONFIGURE_OPTS) \
 	$$(TARGET_CONFIGURE_ARGS) \
 	$$($$(PKG)_CONF_ENV) \
+	CONFIG_SITE="no" \
 	./configure \
 		--target=$$(GNU_TARGET_NAME) \
 		--host=$$(GNU_TARGET_NAME) \
@@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
 		CFLAGS="$$(HOST_CFLAGS)" \
 		LDFLAGS="$$(HOST_LDFLAGS)" \
                 $$($$(PKG)_CONF_ENV) \
+		CONFIG_SITE="no" \
 		./configure \
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
-- 
1.9.3

[Buildroot] [PATCH 2/2] Revert "package/localedef: don't use config.site when cross-compiling"

[Romain Naour]

CONFIG_SITE="no" is now a part of pkg-autotools infrastructure.

This reverts commit 85448febb3c9f21e6e4082fc344b3ef46261c782.
---
 package/localedef/localedef.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index 9a7118a..17ffd14 100644
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -8,10 +8,6 @@ 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
-- 
1.9.3

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Thomas De Schampheleire]

Hi Romain,

On Tue, Aug 19, 2014 at 12:50 AM, 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
>
> For safety, disable loading this file when running the configure
> script for the target and the host.
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/pkg-autotools.mk | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index bcc648d..cdc31bf 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
>         $$(TARGET_CONFIGURE_OPTS) \
>         $$(TARGET_CONFIGURE_ARGS) \
>         $$($$(PKG)_CONF_ENV) \
> +       CONFIG_SITE="no" \
>         ./configure \
>                 --target=$$(GNU_TARGET_NAME) \
>                 --host=$$(GNU_TARGET_NAME) \
> @@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
>                 CFLAGS="$$(HOST_CFLAGS)" \
>                 LDFLAGS="$$(HOST_LDFLAGS)" \
>                  $$($$(PKG)_CONF_ENV) \
> +               CONFIG_SITE="no" \
>                 ./configure \
>                 --prefix="$$(HOST_DIR)/usr" \
>                 --sysconfdir="$$(HOST_DIR)/etc" \

The autoconf documentation does not specify 'no' as a magic value,
which means that the accidental presence of a file called 'no' would
pick up the file.
Wouldn't it be safer/cleaner to use CONFIG_SITE=/dev/null?
Note that I have not tested if this actually works, just a thought.

Best regards,
Thomas

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Romain Naour]

Hi Thomas,

Le 21/08/2014 22:06, Thomas De Schampheleire a ?crit :
> Hi Romain,
> 
> On Tue, Aug 19, 2014 at 12:50 AM, 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
>>
>> For safety, disable loading this file when running the configure
>> script for the target and the host.
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>  package/pkg-autotools.mk | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
>> index bcc648d..cdc31bf 100644
>> --- a/package/pkg-autotools.mk
>> +++ b/package/pkg-autotools.mk
>> @@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
>>         $$(TARGET_CONFIGURE_OPTS) \
>>         $$(TARGET_CONFIGURE_ARGS) \
>>         $$($$(PKG)_CONF_ENV) \
>> +       CONFIG_SITE="no" \
>>         ./configure \
>>                 --target=$$(GNU_TARGET_NAME) \
>>                 --host=$$(GNU_TARGET_NAME) \
>> @@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
>>                 CFLAGS="$$(HOST_CFLAGS)" \
>>                 LDFLAGS="$$(HOST_LDFLAGS)" \
>>                  $$($$(PKG)_CONF_ENV) \
>> +               CONFIG_SITE="no" \
>>                 ./configure \
>>                 --prefix="$$(HOST_DIR)/usr" \
>>                 --sysconfdir="$$(HOST_DIR)/etc" \
> 
> The autoconf documentation does not specify 'no' as a magic value,
> which means that the accidental presence of a file called 'no' would
> pick up the file.
> Wouldn't it be safer/cleaner to use CONFIG_SITE=/dev/null?
> Note that I have not tested if this actually works, just a thought.

I tried with CONFIG_SITE="/dev/null" at first but I had
configure: loading site script /dev/null

I may use THIS_IS_NOT_YOUR_CONFIG_SITE instead :)

So, I'm ok to keep "/dev/null" if you want.

Thanks for review.
Romain

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Mike Zick]

On Thu, 21 Aug 2014 23:19:12 +0200
Romain Naour <romain.naour@openwide.fr> wrote:

> Hi Thomas,
> 
> Le 21/08/2014 22:06, Thomas De Schampheleire a ?crit :
> > Hi Romain,
> > 
> > On Tue, Aug 19, 2014 at 12:50 AM, 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
> >>
> >> For safety, disable loading this file when running the configure
> >> script for the target and the host.
> >>
> >> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> >> ---
> >>  package/pkg-autotools.mk | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> >> index bcc648d..cdc31bf 100644
> >> --- a/package/pkg-autotools.mk
> >> +++ b/package/pkg-autotools.mk
> >> @@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
> >>         $$(TARGET_CONFIGURE_OPTS) \
> >>         $$(TARGET_CONFIGURE_ARGS) \
> >>         $$($$(PKG)_CONF_ENV) \
> >> +       CONFIG_SITE="no" \
> >>         ./configure \
> >>                 --target=$$(GNU_TARGET_NAME) \
> >>                 --host=$$(GNU_TARGET_NAME) \
> >> @@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
> >>                 CFLAGS="$$(HOST_CFLAGS)" \
> >>                 LDFLAGS="$$(HOST_LDFLAGS)" \
> >>                  $$($$(PKG)_CONF_ENV) \
> >> +               CONFIG_SITE="no" \
> >>                 ./configure \
> >>                 --prefix="$$(HOST_DIR)/usr" \
> >>                 --sysconfdir="$$(HOST_DIR)/etc" \
> > 
> > The autoconf documentation does not specify 'no' as a magic value,
> > which means that the accidental presence of a file called 'no' would
> > pick up the file.
> > Wouldn't it be safer/cleaner to use CONFIG_SITE=/dev/null?
> > Note that I have not tested if this actually works, just a thought.
> 
> I tried with CONFIG_SITE="/dev/null" at first but I had
> configure: loading site script /dev/null
> 
> I may use THIS_IS_NOT_YOUR_CONFIG_SITE instead :)
>

Let me guess, that would result in something like:
configure: site script THIS_IS_NOT_YOUR_CONFIG_SITE not found
 
> So, I'm ok to keep "/dev/null" if you want.
> 

If we where voting, I think the:
configure: loading site script /dev/null

is a much better message ans a person can even figure it out.

Mike
> Thanks for review.
> Romain
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Romain Naour]

Hi Mike,

Le 21/08/2014 23:32, Mike Zick a ?crit :
> On Thu, 21 Aug 2014 23:19:12 +0200
> Romain Naour <romain.naour@openwide.fr> wrote:
> 
>> Hi Thomas,
>>
>> Le 21/08/2014 22:06, Thomas De Schampheleire a ?crit :
>>> Hi Romain,
>>>
>>> On Tue, Aug 19, 2014 at 12:50 AM, 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
>>>>
>>>> For safety, disable loading this file when running the configure
>>>> script for the target and the host.
>>>>
>>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>>> ---
>>>>  package/pkg-autotools.mk | 2 ++
>>>>  1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
>>>> index bcc648d..cdc31bf 100644
>>>> --- a/package/pkg-autotools.mk
>>>> +++ b/package/pkg-autotools.mk
>>>> @@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
>>>>         $$(TARGET_CONFIGURE_OPTS) \
>>>>         $$(TARGET_CONFIGURE_ARGS) \
>>>>         $$($$(PKG)_CONF_ENV) \
>>>> +       CONFIG_SITE="no" \
>>>>         ./configure \
>>>>                 --target=$$(GNU_TARGET_NAME) \
>>>>                 --host=$$(GNU_TARGET_NAME) \
>>>> @@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
>>>>                 CFLAGS="$$(HOST_CFLAGS)" \
>>>>                 LDFLAGS="$$(HOST_LDFLAGS)" \
>>>>                  $$($$(PKG)_CONF_ENV) \
>>>> +               CONFIG_SITE="no" \
>>>>                 ./configure \
>>>>                 --prefix="$$(HOST_DIR)/usr" \
>>>>                 --sysconfdir="$$(HOST_DIR)/etc" \
>>>
>>> The autoconf documentation does not specify 'no' as a magic value,
>>> which means that the accidental presence of a file called 'no' would
>>> pick up the file.
>>> Wouldn't it be safer/cleaner to use CONFIG_SITE=/dev/null?
>>> Note that I have not tested if this actually works, just a thought.
>>
>> I tried with CONFIG_SITE="/dev/null" at first but I had
>> configure: loading site script /dev/null
>>
>> I may use THIS_IS_NOT_YOUR_CONFIG_SITE instead :)
>>
> 
> Let me guess, that would result in something like:
> configure: site script THIS_IS_NOT_YOUR_CONFIG_SITE not found

No, there is no print at all.

>  
>> So, I'm ok to keep "/dev/null" if you want.
>>
> 
> If we where voting, I think the:
> configure: loading site script /dev/null
> 
> is a much better message ans a person can even figure it out.

Thanks for voting.

Best regards,
Romain
> 
> Mike
>> Thanks for review.
>> Romain
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 

[Buildroot] [PATCH 1/2] package/pkg-autotools: don't use config.site when cross-compiling

[Thomas De Schampheleire]

Hi,

On Thu, Aug 21, 2014 at 11:50 PM, Romain Naour <romain.naour@openwide.fr> wrote:
> Hi Mike,
>
> Le 21/08/2014 23:32, Mike Zick a ?crit :
>> On Thu, 21 Aug 2014 23:19:12 +0200
>> Romain Naour <romain.naour@openwide.fr> wrote:
>>
>>> Hi Thomas,
>>>
>>> Le 21/08/2014 22:06, Thomas De Schampheleire a ?crit :
>>>> Hi Romain,
>>>>
>>>> On Tue, Aug 19, 2014 at 12:50 AM, 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
>>>>>
>>>>> For safety, disable loading this file when running the configure
>>>>> script for the target and the host.
>>>>>
>>>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>>>> ---
>>>>>  package/pkg-autotools.mk | 2 ++
>>>>>  1 file changed, 2 insertions(+)
>>>>>
>>>>> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
>>>>> index bcc648d..cdc31bf 100644
>>>>> --- a/package/pkg-autotools.mk
>>>>> +++ b/package/pkg-autotools.mk
>>>>> @@ -126,6 +126,7 @@ define $(2)_CONFIGURE_CMDS
>>>>>         $$(TARGET_CONFIGURE_OPTS) \
>>>>>         $$(TARGET_CONFIGURE_ARGS) \
>>>>>         $$($$(PKG)_CONF_ENV) \
>>>>> +       CONFIG_SITE="no" \
>>>>>         ./configure \
>>>>>                 --target=$$(GNU_TARGET_NAME) \
>>>>>                 --host=$$(GNU_TARGET_NAME) \
>>>>> @@ -159,6 +160,7 @@ define $(2)_CONFIGURE_CMDS
>>>>>                 CFLAGS="$$(HOST_CFLAGS)" \
>>>>>                 LDFLAGS="$$(HOST_LDFLAGS)" \
>>>>>                  $$($$(PKG)_CONF_ENV) \
>>>>> +               CONFIG_SITE="no" \
>>>>>                 ./configure \
>>>>>                 --prefix="$$(HOST_DIR)/usr" \
>>>>>                 --sysconfdir="$$(HOST_DIR)/etc" \
>>>>
>>>> The autoconf documentation does not specify 'no' as a magic value,
>>>> which means that the accidental presence of a file called 'no' would
>>>> pick up the file.
>>>> Wouldn't it be safer/cleaner to use CONFIG_SITE=/dev/null?
>>>> Note that I have not tested if this actually works, just a thought.
>>>
>>> I tried with CONFIG_SITE="/dev/null" at first but I had
>>> configure: loading site script /dev/null
>>>
>>> I may use THIS_IS_NOT_YOUR_CONFIG_SITE instead :)
>>>
>>
>> Let me guess, that would result in something like:
>> configure: site script THIS_IS_NOT_YOUR_CONFIG_SITE not found
>
> No, there is no print at all.
>
>>

The logic in the configure script of host-localedef is:

ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
  # We do not want a PATH search for config.site.
  case $CONFIG_SITE in #((
    -*)  ac_site_file1=./$CONFIG_SITE;;
    */*) ac_site_file1=$CONFIG_SITE;;
    *)   ac_site_file1=./$CONFIG_SITE;;
  esac
elif test "x$prefix" != xNONE; then
  ac_site_file1=$prefix/share/config.site
  ac_site_file2=$prefix/etc/config.site
else
  ac_site_file1=$ac_default_prefix/share/config.site
  ac_site_file2=$ac_default_prefix/etc/config.site
fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
  test "x$ac_site_file" = xNONE && continue
  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script
$ac_site_file" >&5

Which means that:

if CONFIG_SITE=NONE,
    ac_site_file1=./NONE --> file not readable, exit
    ac_site_file2=NONE --> NONE, exit

if CONFIG_SITE=no, the same behavior as with NONE (./no and NONE)

if CONFIG_SITE=/dev/null,
    ac_site_file1=/dev/null --> /dev/null, exit
    ac_site_file2=NONE --> NONE, exit

So according to me, /dev/null looks like the cleanest solution.
However, Romain said that this would also print the message, which is
not correct in my tests. Maybe it depends on the version of autoconf
used?

Romain, are you sure there is a message printed when using /dev/null ?

Thanks,
Thomas