package: avoid copying .m4 files from host to staging
Since we are preparing a package generation mechanism, we would like to avoid packages that move/touch/modify files which are not part of their own package. That's why we try to not install host files into the staging directory (in this case .m4 files) and instead we include $(HOST_DIR)/usr/share/aclocal into autoreconf search directory. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
58ddf43464
commit
a68640c31d
@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
|
||||
# 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)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
|
||||
AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
|
||||
|
@ -23,4 +23,5 @@ $(eval $(call AUTOTARGETS,package,automake,host))
|
||||
# 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 = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
|
||||
|
@ -7,15 +7,6 @@ LIBTOOL_VERSION = 2.2.10
|
||||
LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
|
||||
LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
|
||||
|
||||
define HOST_LIBTOOL_CUSTOM_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
|
||||
endef
|
||||
|
||||
HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL
|
||||
|
||||
HOST_LIBTOOL_LIBTOOL_PATCH = NO
|
||||
|
||||
$(eval $(call AUTOTARGETS,package,libtool))
|
||||
|
@ -15,13 +15,6 @@ HOST_PKG_CONFIG_CONF_OPT = \
|
||||
--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \
|
||||
--disable-static
|
||||
|
||||
define HOST_PKG_CONFIG_INSTALL_M4
|
||||
install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/pkg.m4 \
|
||||
$(STAGING_DIR)/usr/share/aclocal/pkg.m4
|
||||
endef
|
||||
|
||||
HOST_PKG_CONFIG_POST_INSTALL_HOOKS += HOST_PKG_CONFIG_INSTALL_M4
|
||||
|
||||
$(eval $(call AUTOTARGETS,package,pkg-config))
|
||||
$(eval $(call AUTOTARGETS,package,pkg-config,host))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user