X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b15238f536bdcbc1fb85c67940b97f1463f90ca0..bcc888bd0c58f2a116a9499d90458d20f90cca66:/include/prereq-build.mk?ds=inline

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index ed8fdb6fc..b0114f0b9 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 
+PKG_NAME:=Build dependency
+
 define Require/non-root
 	[ "$$(shell whoami)" != "root" ]
 endef
@@ -18,11 +20,7 @@ $(eval $(call Require,non-root, \
 
 # Required for the toolchain
 define Require/working-make
-	echo 'all: test' > $(TMP_DIR)/check.mk
-	echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
-	echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
-	echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk
-	$(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk
+	$(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 = "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
 endef
 
 $(eval $(call Require,working-make, \
@@ -50,7 +48,8 @@ $(eval $(call Require,working-gcc, \
 
 define Require/working-g++
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ -
+		g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ - && \
+		$(TMP_DIR)/a.out
 endef
 
 $(eval $(call Require,working-g++, \
@@ -76,6 +75,9 @@ $(eval $(call Require,zlib, \
 	Please install zlib. (Missing libz.so or zlib.h) \
 ))
 
+$(eval $(call RequireCommand,gawk, \
+	Please install GNU awk. \
+))
 
 $(eval $(call RequireCommand,bison, \
 	Please install GNU bison. \
@@ -85,10 +87,6 @@ $(eval $(call RequireCommand,flex, \
 	Please install flex. \
 ))
 
-$(eval $(call RequireCommand,python, \
-	Please install python. \
-))
-
 $(eval $(call RequireCommand,unzip, \
 	Please install unzip. \
 ))
@@ -116,3 +114,19 @@ endef
 $(eval $(call Require,gnutar, \
 	Please install GNU tar. \
 ))
+
+$(eval $(call RequireCommand,svn, \
+	Please install the subversion client. \
+))
+
+$(eval $(call RequireCommand,autoconf, \
+	Please install GNU autoconf. \
+))
+
+define Require/gnu-find
+	$(FIND) $(TMP_DIR) -lname foo
+endef
+
+$(eval $(call Require,gnu-find, \
+	Please install GNU find \
+))