fix unnecessary rebuilds for library package directories with no selected packages
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4767 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
2255e9ca14
commit
3dd3ab4477
|
@ -17,20 +17,10 @@ define Build/DefaultTargets
|
||||||
ifeq ($(CONFIG_AUTOREBUILD),y)
|
ifeq ($(CONFIG_AUTOREBUILD),y)
|
||||||
_INFO:=
|
_INFO:=
|
||||||
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
|
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
|
||||||
_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
|
_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
|
||||||
$(PKG_BUILD_DIR)/.prepared: package-clean
|
$(PKG_BUILD_DIR)/.prepared: package-clean
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
|
|
||||||
_INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1)))
|
|
||||||
$(PKG_BUILD_DIR)/.built: package-rebuild
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(MAKECMDGOALS),prereq)
|
|
||||||
ifneq ($$(_INFO),)
|
|
||||||
$$(info Rebuilding $$(_INFO))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -241,6 +231,19 @@ define BuildPackage
|
||||||
@touch $$@
|
@touch $$@
|
||||||
|
|
||||||
$$(eval $$(call Build/DefaultTargets,$(1)))
|
$$(eval $$(call Build/DefaultTargets,$(1)))
|
||||||
|
|
||||||
|
ifneq ($$(CONFIG_PACKAGE_$(1)),)
|
||||||
|
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1)))
|
||||||
|
_INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
|
||||||
|
$(PKG_BUILD_DIR)/.built: package-rebuild
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(MAKECMDGOALS),prereq)
|
||||||
|
ifneq ($$(_INFO),)
|
||||||
|
$$(info Rebuilding $$(_INFO))
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifneq ($(strip $(PKG_CAT)),)
|
ifneq ($(strip $(PKG_CAT)),)
|
||||||
|
|
Loading…
Reference in New Issue