[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[tpetazzoni at uclibc.org]

Author: tpetazzoni
Date: 2009-03-26 16:55:21 +0000 (Thu, 26 Mar 2009)
New Revision: 25827

Log:
/usr/share/aclocal is now in $(HOST_DIR) and not $(STAGING_DIR).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Modified:
   trunk/buildroot/package/automake/automake.mk


Changeset:
Modified: trunk/buildroot/package/automake/automake.mk
===================================================================
--- trunk/buildroot/package/automake/automake.mk	2009-03-26 13:48:46 UTC (rev 25826)
+++ trunk/buildroot/package/automake/automake.mk	2009-03-26 16:55:21 UTC (rev 25827)
@@ -20,7 +20,7 @@
 
 # variables used by other packages
 AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
+ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
 
 $(DL_DIR)/$(AUTOMAKE_SOURCE):

[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[Peter Korsgaard]

>>>>> "tpetazzoni" == tpetazzoni  <tpetazzoni@uclibc.org> writes:

 tpetazzoni> Author: tpetazzoni
 tpetazzoni> Date: 2009-03-26 16:55:21 +0000 (Thu, 26 Mar 2009)
 tpetazzoni> New Revision: 25827

 tpetazzoni> Log:
 tpetazzoni> /usr/share/aclocal is now in $(HOST_DIR) and not $(STAGING_DIR).

Hmm, isn't this mixing up the host aclocal dir and the target
(staging) one? The host packages install into HOST_DIR (and hence
HOST_DIR/usr/share/aclocal), and the target libraries install into
STAGING_DIR.

I guess auto* won't be able to find the m4 files for the packages
where we don't build a host version with this change.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[Thomas Petazzoni]

Le Thu, 26 Mar 2009 18:02:06 +0100,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> Hmm, isn't this mixing up the host aclocal dir and the target
> (staging) one? The host packages install into HOST_DIR (and hence
> HOST_DIR/usr/share/aclocal), and the target libraries install into
> STAGING_DIR.
> 
> I guess auto* won't be able to find the m4 files for the packages
> where we don't build a host version with this change.

I must admit I don't know. But, when AUTORECONF is set in the package
(as is done by tslib), then the command in the $(AUTORECONF) variable,
defined in autoconf/autoconf.mk is called. This command is :

AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"

So it uses the host autoreconf tool, and gives ACLOCAL_DIR as the path
for m4 files. So obviously, this ACLOCAL_DIR should be relative to
HOST_DIR and not STAGING_DIR.

At least, my (maybe incorrect) change fixes the issue I reported in
the mail titled "Bug while autoreconfiguring tslib", sent today. But
maybe the correct fix is something like

- AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
+ AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(HOST_ACLOCAL_DIR)"

And then defining HOST_ACLOCAL_DIR relatively to $(HOST_DIR).

BTW, could you remind me why we need to compile all these tools for the
host (pkg-config, automake, autoconf). Couldn't they be dependencies of
Buildroot ?

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Thomas> At least, my (maybe incorrect) change fixes the issue I reported in
 Thomas> the mail titled "Bug while autoreconfiguring tslib", sent today. But
 Thomas> maybe the correct fix is something like

 Thomas> - AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
 Thomas> + AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(HOST_ACLOCAL_DIR)"

I think the best/simplest solution is to just copy the aclocal files
of the cross tools (pkgconfig +auto*) from HOST_DIR to STAGING_DIR and
point ACLOCAL_DIR to STAGING_DIR - I'll give it a test.

 Thomas> BTW, could you remind me why we need to compile all these tools for the
 Thomas> host (pkg-config, automake, autoconf). Couldn't they be dependencies of
 Thomas> Buildroot ?

pkg-config to make it look in staging_dir and not the host directory,
and the auto* stuff simply because of the exact version dependencies
(E.G. certain stuff works with 2.61 and not with 2.63 or the other
way, so it keeps us a bit more sane to know that everyone uses the
same version).

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: [25827] trunk/buildroot/package/automake

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:

Hi,

 Peter> I think the best/simplest solution is to just copy the aclocal files
 Peter> of the cross tools (pkgconfig +auto*) from HOST_DIR to STAGING_DIR and
 Peter> point ACLOCAL_DIR to STAGING_DIR - I'll give it a test.

Ok, that seems to work. Simply make sure STAGING_DIR/usr/share/aclocal
gets created and copy over the pkgconfig + libtool .m4 files from
HOST_DIR to STAGING_DIR.

Committed as r25880.

-- 
Bye, Peter Korsgaard