diff options
| author |  Yann E. MORIN <yann.morin.1998@free.fr> | 2014-11-12 01:25:48 +0100 |
|---|---|---|
| committer |  Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-22 20:34:31 +0100 |
| commit | 59c647e37ddff902259f4165140928011114994f (patch) | |
| tree | 702fe9f47d93180e7db7f5f0bd5eb3c6c0c5308d /package/pkg-autotools.mk | |
| parent | 3a82b1ec3db7b91c62c3ce13472f2a89dcb815d3 (diff) | |
| download | buildroot-59c647e37ddff902259f4165140928011114994f.tar.gz buildroot-59c647e37ddff902259f4165140928011114994f.tar.bz2 | |
pkg-autotools: re-order cleaning up the host dependencies
Move the host dependencies cleanup out from in-between all the hooks, so
it is easier to see how the hooks all work together.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Johan Oudinet <johan.oudinet@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pkg-autotools.mk')
| -rw-r--r-- | package/pkg-autotools.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 60f6997ea0..6e198edf2a 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -169,6 +169,14 @@ $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install +# This must be repeated from inner-generic-package, otherwise we get an empty +# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF +# and _GETTEXTIZE away from the non-host rule +ifeq ($(4),host) +$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ + host-gettext host-toolchain $(1),\ + $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif # # Configure step. Only define it if not already defined by the package @@ -248,15 +256,6 @@ ifneq ($$($(2)_LIBTOOL_PATCH),NO) $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK endif -# This must be repeated from inner-generic-package, otherwise we get an empty -# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF -# and _GETTEXTIZE away from the non-host rule -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ - host-gettext host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - ifeq ($$($(2)_AUTORECONF),YES) # This has to come before autoreconf ifeq ($$($(2)_GETTEXTIZE),YES) |