Skip to contentSkip to conversation

automake: complete the removal of the target package

PATCH New Fabio Porcedda 3 participants 9 messages Feb 1, 2015 – Feb 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 automake: complete the removal of the target package

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.

---
 package/autoconf/autoconf.mk | 2 +-
 package/automake/automake.mk | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
package/autoconf/autoconf.mk +1 -1
index fd91961..2c0ff30 100644
@@ -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)"
package/automake/automake.mk +1 -2
index a3fd18c..5021b49 100644
@@ -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)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/2 automake: use whenever possible the ACLOCAL_DIR variable

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.

---
 package/automake/automake.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/automake/automake.mk +4 -2
index 5021b49..264cbad 100644
@@ -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)
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/2 automake: use whenever possible the ACLOCAL_DIR variable

Hi Fabio,

Le 01/02/2015 17:51, Fabio Porcedda a ?crit :

Quoted 29 lines

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.

---
 package/automake/automake.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/automake/automake.mk +4 -1
index 5021b49..264cbad 100644
@@ -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

package/automake/automake.mk $(eval $(host-autotools-package)) · line 34

Quoted 5 lines
package/automake/automake.mk +0 -1
@@ -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)

Best regards,
Romain Naour

#3 lore raw

PATCH 2/2 automake: use whenever possible the ACLOCAL_DIR variable

In reply to Fabio Porcedda
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Porcedda <[email protected]> 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.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 2/2 automake: use whenever possible the ACLOCAL_DIR variable

Quoted 9 lines · Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Porcedda <[email protected]> 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.

Committed, thanks.

I've sent an updated version of this patch:
http://patchwork.ozlabs.org/patch/437690/

BR

Signature · 1 line
Fabio Porcedda
#5 lore raw

PATCH 1/2 automake: complete the removal of the target package

In reply to Fabio Porcedda

Hi Fabio,

Le 01/02/2015 17:51, Fabio Porcedda a ?crit :

Quoted 30 lines

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.

---
 package/autoconf/autoconf.mk | 2 +-
 package/automake/automake.mk | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
package/autoconf/autoconf.mk +1 -1
index fd91961..2c0ff30 100644
@@ -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)"
package/automake/automake.mk +0 -0
index a3fd18c..5021b49 100644

package/automake/automake.mk $(eval $(host-autotools-package)) · line 32

Quoted 7 lines
package/automake/automake.mk +1 -2
@@ -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)

Best regards,
Romain Naour

#6 lore raw

PATCH 1/2 automake: complete the removal of the target package

In reply to Fabio Porcedda
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Porcedda <[email protected]> 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.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/2 automake: complete the removal of the target package

Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Fabio" == Fabio Porcedda <[email protected]> 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.

Quoted 6 lines
Quoted 4 lines

Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf package.

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.

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH 1/2 automake: complete the removal of the target package

Quoted 18 lines · Peter Korsgaard
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Fabio" == Fabio Porcedda <[email protected]> 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.

Quoted 6 lines
Quoted 4 lines

Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf package.

Committed, thanks.

Actually, this doesn't work as we still need to look for .m4 files installed by other target packages.

Quoted 6 lines

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

Signature · 1 line
Fabio Porcedda