build: use config.site generated by autoconf-lean, drop hardcoded sitefiles

[openwrt/staging/nbd.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index d38d52908ef3075ea2f5727e6817b2aabb7696d5..4532ec81435211fe010e2db539ce017ea9be09fa 100644 (file)
--- 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) \
-               )) \
+               ))) \
        ))
 
 
@@ -116,7 +116,7 @@ include $(INCLUDE_DIR)/autotools.mk
 _pkg_target:=$(if $(QUILT),,.)
 
 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
+CONFIG_SITE:=$(TOOLCHAIN_DIR)/config.site
 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig