From: Felix Fietkau Date: Wed, 20 Jan 2016 19:12:28 +0000 (+0000) Subject: include/autoconf.mk: decouple host fixups from target fixups X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;ds=sidebyside;h=6d7af0d09fac8af05ed4c31d826be20c5296d48a;p=openwrt-github%2F.git include/autoconf.mk: decouple host fixups from target fixups Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48403 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/autotools.mk b/include/autotools.mk index 3316998dc9..3e028fa72d 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -143,27 +143,21 @@ define patch_libtool_host $(HOST_BUILD_DIR))) endef -ifneq ($(filter patch-libtool,$(PKG_FIXUP)),) +ifneq ($(filter patch-libtool-host,$(PKG_FIXUP)),) Hooks/HostConfigure/Pre += patch_libtool_host endif -ifneq ($(filter patch-libtool,$(HOST_FIXUP)),) +ifneq ($(filter patch-libtool-host,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR))) endif -ifneq ($(filter libtool,$(HOST_FIXUP)),) - ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) - Hooks/HostConfigure/Pre += autoreconf_host - endif -endif - -ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),) +ifneq ($(filter libtool-host,$(HOST_FIXUP)),) ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += autoreconf_host endif endif -ifneq ($(filter autoreconf,$(HOST_FIXUP)),) +ifneq ($(filter autoreconf-host,$(HOST_FIXUP)),) ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),) Hooks/HostConfigure/Pre += autoreconf_host endif