Commit 59c647e3 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

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: default avatar"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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3a82b1ec

package/pkg-autotools.mk

+8 −9
Original line number Diff line number Diff line
@@ -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)