[Buildroot] svn commit: [25880] trunk/buildroot/package: automake libtool pkgconfig

[Buildroot] svn commit: [25880] trunk/buildroot/package: automake libtool pkgconfig

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-03-29 19:10:26 +0000 (Sun, 29 Mar 2009)
New Revision: 25880

Log:
package: proper aclocal fix

Revert r25827 and instead copy over the host aclocal files of the stuff
needed for auto* (libtool + pkgconfig). These logically belong with the
target stuff, as they are used for the target auto* toolchain.

Long term we should probably consider using
aclocal --acdir=$(STAGING_DIR)/usr/share/aclocal, so the host .m4 files
cannot interfere with the target build.

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


Changeset:
Modified: trunk/buildroot/package/automake/automake.mk
===================================================================
--- trunk/buildroot/package/automake/automake.mk	2009-03-29 18:32:18 UTC (rev 25879)
+++ trunk/buildroot/package/automake/automake.mk	2009-03-29 19:10:26 UTC (rev 25880)
@@ -20,7 +20,7 @@
 
 # variables used by other packages
 AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
 
 $(DL_DIR)/$(AUTOMAKE_SOURCE):
@@ -51,6 +51,7 @@
 
 $(STAMP_DIR)/host_automake_installed: $(STAMP_DIR)/host_automake_compiled
 	$(MAKE) -C $(AUTOMAKE_HOST_DIR) install
+	mkdir -p $(STAGING_DIR)/usr/share/aclocal
 	touch $@
 
 host-automake: $(STAMP_DIR)/host_automake_installed

Modified: trunk/buildroot/package/libtool/libtool.mk
===================================================================
--- trunk/buildroot/package/libtool/libtool.mk	2009-03-29 18:32:18 UTC (rev 25879)
+++ trunk/buildroot/package/libtool/libtool.mk	2009-03-29 19:10:26 UTC (rev 25880)
@@ -49,6 +49,10 @@
 
 $(STAMP_DIR)/host_libtool_installed: $(STAMP_DIR)/host_libtool_compiled
 	$(MAKE) -C $(LIBTOOL_HOST_DIR) install
+	install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/libtool.m4 \
+		$(STAGING_DIR)/usr/share/aclocal/libtool.m4
+	install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/ltdl.m4 \
+		$(STAGING_DIR)/usr/share/aclocal/ltdl.m4
 	touch $@
 
 host-libtool: $(STAMP_DIR)/host_libtool_installed

Modified: trunk/buildroot/package/pkgconfig/pkgconfig.mk
===================================================================
--- trunk/buildroot/package/pkgconfig/pkgconfig.mk	2009-03-29 18:32:18 UTC (rev 25879)
+++ trunk/buildroot/package/pkgconfig/pkgconfig.mk	2009-03-29 19:10:26 UTC (rev 25880)
@@ -50,6 +50,8 @@
 
 $(STAMP_DIR)/host_pkgconfig_installed: $(STAMP_DIR)/host_pkgconfig_compiled
 	$(MAKE) -C $(PKG_CONFIG_HOST_DIR) install
+	install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/pkg.m4 \
+		$(STAGING_DIR)/usr/share/aclocal/pkg.m4
 	touch $@
 
 host-pkgconfig: $(STAMP_DIR)/host_pkgconfig_installed

[Buildroot] svn commit: [25880] trunk/buildroot/package: automake libtool pkgconfig

[Thomas Petazzoni]

Hi,

Le Sun, 29 Mar 2009 19:10:26 +0000 (UTC),
jacmet at uclibc.org a ?crit :

> Revert r25827 and instead copy over the host aclocal files of the
> stuff needed for auto* (libtool + pkgconfig). These logically belong
> with the target stuff, as they are used for the target auto*
> toolchain.
> 
> Long term we should probably consider using
> aclocal --acdir=$(STAGING_DIR)/usr/share/aclocal, so the host .m4
> files cannot interfere with the target build.

I must admit I'm far from being a auto* expert, and I'm quite confused
by the host vs. target auto* difference. So please excuse my silly
questions.

With your version, when a package sets FOO_AUTORECONF=YES, it will use
the autotools of the host (installed in $(HOST_DIR)), but these
autotools will be told to use the aclocal files in $(STAGING_DIR), and
therefore will only see the aclocal files for libtool and pkgconfig. Is
this what we want ?

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

[Buildroot] svn commit: [25880] trunk/buildroot/package: automake libtool pkgconfig

[Peter Korsgaard]

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

Hi,

 Thomas> I must admit I'm far from being a auto* expert, and I'm quite
 Thomas> confused by the host vs. target auto* difference. So please
 Thomas> excuse my silly questions.

 Thomas> With your version, when a package sets FOO_AUTORECONF=YES, it
 Thomas> will use the autotools of the host (installed in
 Thomas> $(HOST_DIR)), but these autotools will be told to use the
 Thomas> aclocal files in $(STAGING_DIR), and therefore will only see
 Thomas> the aclocal files for libtool and pkgconfig. Is this what we
 Thomas> want ?

That and all the .m4 files installed by the various
packages - E.G. from a build with X support:

ls build_arm/staging_dir/usr/share/aclocal
codeset.m4       intl.m4          longdouble.m4    ulonglong.m4
freetype2.m4     intmax.m4        longlong.m4      visibility.m4
gettext.m4       inttypes_h.m4    ltdl.m4          wchar_t.m4
glib-2.0.m4      inttypes-pri.m4  nls.m4           wint_t.m4
glibc21.m4       lcmessage.m4     pkg.m4           xaw.m4
glibc2.m4        lib-ld.m4        po.m4            xorg-macros.m4
glib-gettext.m4  lib-link.m4      printf-posix.m4  xorg-server.m4
gtk-2.0.m4       lib-prefix.m4    progtest.m4      xorgversion.m4
iconv.m4         libtool.m4       size_max.m4      xsize.m4
intdiv0.m4       libxml.m4        stdint_h.m4      xtrans.m4
intldir.m4       lock.m4          uintmax_t.m4

The point is to not mix up stuff (in this case .m4 files) between host
and target builds. Our staging dir used to be a big mix of stuff for
the host and the target, and this is part of a cleanup of it.

-- 
Bye, Peter Korsgaard