From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 4 Aug 2008 23:15:17 +0000 (+0000)
Subject: make package prereq checks behave more like build prereq checks (first check all... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1b838dbd95b1e9facc58184b6327d8a844e1c9e8;p=openwrt%2Fstaging%2Fjow.git

make package prereq checks behave more like build prereq checks (first check all, then fail if necessary), also make them less verbose

SVN-Revision: 12106
---

diff --git a/Makefile b/Makefile
index 72b24d14e7..7e43b44321 100644
--- a/Makefile
+++ b/Makefile
@@ -56,8 +56,19 @@ dirclean: clean
 	rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
 	rm -rf $(TMP_DIR)
 
+tmp/.prereq_packages: .config
+	unset ERROR; \
+	for package in $(sort $(prereq-y) $(prereq-m)); do \
+		$(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \
+	done; \
+	if [ -n "$$ERROR" ]; then \
+		echo "Package prerequisite check failed."; \
+		false; \
+	fi
+	touch $@
+
 # check prerequisites before starting to build
-prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
+prereq: $(target/stamp-prereq) tmp/.prereq_packages
 
 prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
 world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE