X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d8ced17f8b4963015c43b0084650231bef7bb565..163711a470c242dcf704e394d5fe2c913b9c0caa:/include/package.mk diff --git a/include/package.mk b/include/package.mk index b4b6538b6..332833272 100644 --- a/include/package.mk +++ b/include/package.mk @@ -15,17 +15,23 @@ include $(INCLUDE_DIR)/prereq.mk define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) + _INFO:= ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(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) + $$(info Rebuilding $$(_INFO)) + endif endif endif - $(PKG_BUILD_DIR)/.prepared: @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) @@ -252,11 +258,11 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ [ -x configure ] && \ - $(2) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + $(2) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -286,7 +292,6 @@ endef define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ ARCH="$(ARCH)" \