X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=db0a869dab62b9b914a069796d1d8dc69091e77e;hb=9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff;hp=0f1dd5cc5069dc4586fd5a0e1604eed265879e0c;hpb=b12288fa69b171f7c9405518c9bed3581a06f7ce;p=openwrt%2Fopenwrt.git diff --git a/include/package.mk b/include/package.mk index 0f1dd5cc50..db0a869dab 100644 --- a/include/package.mk +++ b/include/package.mk @@ -58,7 +58,7 @@ include $(INCLUDE_DIR)/quilt.mk find_library_dependencies = \ $(wildcard $(patsubst %,$(STAGING_DIR)/pkginfo/%.version, \ - $(sort $(foreach dep4, \ + $(filter-out $(BUILD_PACKAGES), $(sort $(foreach dep4, \ $(sort $(foreach dep3, \ $(sort $(foreach dep2, \ $(sort $(foreach dep1, \ @@ -73,7 +73,7 @@ find_library_dependencies = \ $(Package/$(dep3)/depends) $(dep3) \ )), \ $(Package/$(dep4)/depends) $(dep4) \ - )) \ + ))) \ )) @@ -178,7 +178,6 @@ Build/Exports=$(Build/Exports/Default) define Build/CoreTargets STAMP_PREPARED:=$$(STAMP_PREPARED) STAMP_CONFIGURED:=$$(STAMP_CONFIGURED) - PKG_ABI_VERSION:=$$(PKG_ABI_VERSION) $(if $(QUILT),$(Build/Quilt)) $(call Build/Autoclean) @@ -237,7 +236,6 @@ define Build/CoreTargets "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)" \ "$(STAGING_DIR)"; \ fi - $(if $(PKG_ABI_VERSION),$(SET_ABI_VERSION) "$(PKG_ABI_VERSION)" $(TMP_DIR)/stage-$(PKG_DIR_NAME)) if [ -d $(TMP_DIR)/stage-$(PKG_DIR_NAME) ]; then \ (cd $(TMP_DIR)/stage-$(PKG_DIR_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_DIR_NAME).files); \ $(call locked, \