* [Buildroot] [PATCH 1/2] automake: complete the removal of the target package
@ 2015-02-01 16:51 Fabio Porcedda
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Fabio Porcedda @ 2015-02-01 16:51 UTC (permalink / raw)
To: buildroot
The variable ACLOCAL_DIR points to the staging area but is not useful
anymore because the target package was removed. Fix ACLOCAL_DIR by
pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR
because ACLOCAL_DIR has the same value so it's not useful anymore.
Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf
package.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
package/autoconf/autoconf.mk | 2 +-
package/automake/automake.mk | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index fd91961..2c0ff30 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -23,4 +23,4 @@ $(eval $(host-autotools-package))
# variables used by other packages
AUTOCONF = $(HOST_DIR)/usr/bin/autoconf
AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader
-AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index a3fd18c..5021b49 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -28,6 +28,5 @@ $(eval $(host-autotools-package))
# variables used by other packages
AUTOMAKE = $(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
-ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable
2015-02-01 16:51 [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Fabio Porcedda
@ 2015-02-01 16:51 ` Fabio Porcedda
2015-02-01 21:52 ` Romain Naour
2015-02-02 23:02 ` Peter Korsgaard
2015-02-01 21:51 ` [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Romain Naour
2015-02-02 23:01 ` Peter Korsgaard
2 siblings, 2 replies; 9+ messages in thread
From: Fabio Porcedda @ 2015-02-01 16:51 UTC (permalink / raw)
To: buildroot
Use the ACLOCAL_DIR in the GTK_DOC_M4_INSTALL hook.
Move the ACLOCAL_DIR definition at the beginning so the definition is
ahead the utilization.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
package/automake/automake.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 5021b49..264cbad 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -12,8 +12,11 @@ AUTOMAKE_LICENSE_FILES = COPYING
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
+ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
+
define GTK_DOC_M4_INSTALL
- $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
+ $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
+ $(ACLOCAL_DIR)/gtk-doc.m4
endef
# ensure staging aclocal dir exists
@@ -28,5 +31,4 @@ $(eval $(host-autotools-package))
# variables used by other packages
AUTOMAKE = $(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] automake: complete the removal of the target package
2015-02-01 16:51 [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Fabio Porcedda
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
@ 2015-02-01 21:51 ` Romain Naour
2015-02-02 23:01 ` Peter Korsgaard
2 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2015-02-01 21:51 UTC (permalink / raw)
To: buildroot
Hi Fabio,
Le 01/02/2015 17:51, Fabio Porcedda a ?crit :
> The variable ACLOCAL_DIR points to the staging area but is not useful
> anymore because the target package was removed. Fix ACLOCAL_DIR by
> pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR
> because ACLOCAL_DIR has the same value so it's not useful anymore.
>
> Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf
> package.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
> package/autoconf/autoconf.mk | 2 +-
> package/automake/automake.mk | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
> index fd91961..2c0ff30 100644
> --- a/package/autoconf/autoconf.mk
> +++ b/package/autoconf/autoconf.mk
> @@ -23,4 +23,4 @@ $(eval $(host-autotools-package))
> # variables used by other packages
> AUTOCONF = $(HOST_DIR)/usr/bin/autoconf
> AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader
> -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
> +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
> diff --git a/package/automake/automake.mk b/package/automake/automake.mk
> index a3fd18c..5021b49 100644
> --- a/package/automake/automake.mk
> +++ b/package/automake/automake.mk
> @@ -28,6 +28,5 @@ $(eval $(host-autotools-package))
>
> # variables used by other packages
> AUTOMAKE = $(HOST_DIR)/usr/bin/automake
> -ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
> -ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
> +ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
> ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Best regards,
Romain Naour
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
@ 2015-02-01 21:52 ` Romain Naour
2015-02-02 23:02 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Romain Naour @ 2015-02-01 21:52 UTC (permalink / raw)
To: buildroot
Hi Fabio,
Le 01/02/2015 17:51, Fabio Porcedda a ?crit :
> Use the ACLOCAL_DIR in the GTK_DOC_M4_INSTALL hook.
>
> Move the ACLOCAL_DIR definition at the beginning so the definition is
> ahead the utilization.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
> package/automake/automake.mk | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/package/automake/automake.mk b/package/automake/automake.mk
> index 5021b49..264cbad 100644
> --- a/package/automake/automake.mk
> +++ b/package/automake/automake.mk
> @@ -12,8 +12,11 @@ AUTOMAKE_LICENSE_FILES = COPYING
>
> HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
>
> +ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
> +
> define GTK_DOC_M4_INSTALL
> - $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
> + $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
> + $(ACLOCAL_DIR)/gtk-doc.m4
> endef
>
> # ensure staging aclocal dir exists
> @@ -28,5 +31,4 @@ $(eval $(host-autotools-package))
>
> # variables used by other packages
> AUTOMAKE = $(HOST_DIR)/usr/bin/automake
> -ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
> ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Best regards,
Romain Naour
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] automake: complete the removal of the target package
2015-02-01 16:51 [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Fabio Porcedda
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
2015-02-01 21:51 ` [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Romain Naour
@ 2015-02-02 23:01 ` Peter Korsgaard
2015-02-02 23:38 ` Peter Korsgaard
2 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2015-02-02 23:01 UTC (permalink / raw)
To: buildroot
>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
> The variable ACLOCAL_DIR points to the staging area but is not useful
> anymore because the target package was removed. Fix ACLOCAL_DIR by
> pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR
> because ACLOCAL_DIR has the same value so it's not useful anymore.
> Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf
> package.
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
2015-02-01 21:52 ` Romain Naour
@ 2015-02-02 23:02 ` Peter Korsgaard
2015-02-08 10:48 ` Fabio Porcedda
1 sibling, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2015-02-02 23:02 UTC (permalink / raw)
To: buildroot
>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
> Use the ACLOCAL_DIR in the GTK_DOC_M4_INSTALL hook.
> Move the ACLOCAL_DIR definition at the beginning so the definition is
> ahead the utilization.
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] automake: complete the removal of the target package
2015-02-02 23:01 ` Peter Korsgaard
@ 2015-02-02 23:38 ` Peter Korsgaard
2015-02-08 10:51 ` Fabio Porcedda
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2015-02-02 23:38 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
>> The variable ACLOCAL_DIR points to the staging area but is not useful
>> anymore because the target package was removed. Fix ACLOCAL_DIR by
>> pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR
>> because ACLOCAL_DIR has the same value so it's not useful anymore.
>> Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf
>> package.
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Committed, thanks.
Actually, this doesn't work as we still need to look for .m4 files
installed by other target packages.
E.G.
http://autobuild.buildroot.net/results/b20/b20e3efcb0be3032781d7b2f0ef4c351834da0ce/
target-alsa-utils cannot find alsa.m4 installed by target-alsa-lib.
So I've reverted it again.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable
2015-02-02 23:02 ` Peter Korsgaard
@ 2015-02-08 10:48 ` Fabio Porcedda
0 siblings, 0 replies; 9+ messages in thread
From: Fabio Porcedda @ 2015-02-08 10:48 UTC (permalink / raw)
To: buildroot
On Tue, Feb 3, 2015 at 12:02 AM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
>
> > Use the ACLOCAL_DIR in the GTK_DOC_M4_INSTALL hook.
> > Move the ACLOCAL_DIR definition at the beginning so the definition is
> > ahead the utilization.
>
> > Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> Committed, thanks.
I've sent an updated version of this patch:
http://patchwork.ozlabs.org/patch/437690/
BR
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] automake: complete the removal of the target package
2015-02-02 23:38 ` Peter Korsgaard
@ 2015-02-08 10:51 ` Fabio Porcedda
0 siblings, 0 replies; 9+ messages in thread
From: Fabio Porcedda @ 2015-02-08 10:51 UTC (permalink / raw)
To: buildroot
On Tue, Feb 3, 2015 at 12:38 AM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
>
>>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
> >> The variable ACLOCAL_DIR points to the staging area but is not useful
> >> anymore because the target package was removed. Fix ACLOCAL_DIR by
> >> pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR
> >> because ACLOCAL_DIR has the same value so it's not useful anymore.
>
> >> Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf
> >> package.
>
> >> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> > Committed, thanks.
>
> Actually, this doesn't work as we still need to look for .m4 files
> installed by other target packages.
>
> E.G.
> http://autobuild.buildroot.net/results/b20/b20e3efcb0be3032781d7b2f0ef4c351834da0ce/
>
> target-alsa-utils cannot find alsa.m4 installed by target-alsa-lib.
>
> So I've reverted it again.
Sorry, I didn't know that this variable is still useful.
I will try to test it more the next time.
Thanks
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-02-08 10:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-01 16:51 [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Fabio Porcedda
2015-02-01 16:51 ` [Buildroot] [PATCH 2/2] automake: use whenever possible the ACLOCAL_DIR variable Fabio Porcedda
2015-02-01 21:52 ` Romain Naour
2015-02-02 23:02 ` Peter Korsgaard
2015-02-08 10:48 ` Fabio Porcedda
2015-02-01 21:51 ` [Buildroot] [PATCH 1/2] automake: complete the removal of the target package Romain Naour
2015-02-02 23:01 ` Peter Korsgaard
2015-02-02 23:38 ` Peter Korsgaard
2015-02-08 10:51 ` Fabio Porcedda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox