Author: nbd
Date: 2016-01-20 21:46:20 +0100 (Wed, 20 Jan 2016)
New Revision: 48412
Modified:
trunk/include/autotools.mk
Log:
Revert "include/autoconf.mk: decouple host fixups from target fixups"
This reverts commit r48403
Modified: trunk/include/autotools.mk
===================================================================
--- trunk/include/autotools.mk 2016-01-20 20:27:08 UTC (rev 48411)
+++ trunk/include/autotools.mk 2016-01-20 20:46:20 UTC (rev 48412)
@@ -143,21 +143,27 @@
$(HOST_BUILD_DIR)))
endef
-ifneq ($(filter patch-libtool-host,$(PKG_FIXUP)),)
+ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
Hooks/HostConfigure/Pre += patch_libtool_host
endif
-ifneq ($(filter patch-libtool-host,$(HOST_FIXUP)),)
+ifneq ($(filter patch-libtool,$(HOST_FIXUP)),)
Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR)))
endif
-ifneq ($(filter libtool-host,$(HOST_FIXUP)),)
+ifneq ($(filter libtool,$(HOST_FIXUP)),)
ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
Hooks/HostConfigure/Pre += autoreconf_host
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)),)
Hooks/HostConfigure/Pre += autoreconf_host
endif
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
