EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "include/autoconf.mk: decouple host fixups from target fixups"

Browse Source 
This reverts commit r48403

SVN-Revision: 48412
This commit is contained in:
Felix Fietkau 2016-01-20 20:46:20 +00:00
parent c7308bc9f1
commit f8cdadc832
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/autotools.mk
View File

@ -143,21 +143,27 @@ define patch_libtool_host
$(HOST_BUILD_DIR))) $(HOST_BUILD_DIR)))
endef endef
ifneq ($(filter patch-libtool-host,$(PKG_FIXUP)),) ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
Hooks/HostConfigure/Pre += patch_libtool_host Hooks/HostConfigure/Pre += patch_libtool_host
endif endif
ifneq ($(filter patch-libtool-host,$(HOST_FIXUP)),) ifneq ($(filter patch-libtool,$(HOST_FIXUP)),)
Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR))) Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR)))
endif endif
ifneq ($(filter libtool-host,$(HOST_FIXUP)),) ifneq ($(filter libtool,$(HOST_FIXUP)),)
ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
Hooks/HostConfigure/Pre += autoreconf_host Hooks/HostConfigure/Pre += autoreconf_host
endif endif
endif endif
ifneq ($(filter autoreconf-host,$(HOST_FIXUP)),) ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
Hooks/HostConfigure/Pre += autoreconf_host
endif
endif
ifneq ($(filter autoreconf,$(HOST_FIXUP)),)
ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),) ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),)
Hooks/HostConfigure/Pre += autoreconf_host Hooks/HostConfigure/Pre += autoreconf_host
endif endif