Commit 6099e286 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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.
parent fb56c53e

package/automake/automake.mk

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_HOST_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-host 


# 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_compiled: $(STAMP_DIR)/host_automake_configured 


$(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

package/libtool/libtool.mk

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ $(STAMP_DIR)/host_libtool_compiled: $(STAMP_DIR)/host_libtool_configured 


$(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

package/pkgconfig/pkgconfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ $(STAMP_DIR)/host_pkgconfig_compiled: $(STAMP_DIR)/host_pkgconfig_configured 


$(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