X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/270fe35d13f87ccf41feef8642c47a968a480a37..98ec8455f285003312576ca9b55292fe1263ed1a:/include/prereq-build.mk?ds=sidebyside

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7355b9e31..84d3f2274 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -20,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, \
@@ -41,6 +37,20 @@ $(eval $(call Require,case-sensitive-fs, \
 	OpenWrt can only be built on a case-sensitive filesystem \
 ))
 
+define Require/getopt
+	getopt --help 2>&1 | grep long >/dev/null
+endef
+$(eval $(call Require,getopt, \
+	Please install GNU getopt \
+))
+
+define Require/fileutils
+	gcp --help || cp --help
+endef
+$(eval $(call Require,fileutils, \
+	Please install GNU fileutils \
+))
+
 define Require/working-gcc
 	echo 'int main(int argc, char **argv) { return 0; }' | \
 		gcc -x c -o $(TMP_DIR)/a.out -
@@ -52,7 +62,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++, \
@@ -61,7 +72,7 @@ $(eval $(call Require,working-g++, \
 
 define Require/ncurses
 	echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
-		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses -
+		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses
 endef
 
 $(eval $(call Require,ncurses, \
@@ -71,7 +82,7 @@ $(eval $(call Require,ncurses, \
 
 define Require/zlib
 	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
-		gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz -
+		gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - -lz
 endef
 
 $(eval $(call Require,zlib, \
@@ -82,10 +93,6 @@ $(eval $(call RequireCommand,gawk, \
 	Please install GNU awk. \
 ))
 
-$(eval $(call RequireCommand,bison, \
-	Please install GNU bison. \
-))
-
 $(eval $(call RequireCommand,flex, \
 	Please install flex. \
 ))
@@ -106,6 +113,10 @@ $(eval $(call RequireCommand,perl, \
 	Please install perl. \
 ))
 
+$(eval $(call RequireCommand,python, \
+	Please install python. \
+))
+
 $(eval $(call RequireCommand,wget, \
 	Please install wget. \
 ))
@@ -118,14 +129,22 @@ $(eval $(call Require,gnutar, \
 	Please install GNU tar. \
 ))
 
-$(eval $(call RequireCommand,autoconf, \
-	Please install GNU autoconf. \
+$(eval $(call RequireCommand,svn, \
+	Please install the subversion client. \
+))
+
+define Require/gnu-find
+	$(FIND) --version 2>/dev/null
+endef
+
+$(eval $(call Require,gnu-find, \
+	Please install GNU find \
 ))
 
-define Require/find
-	find . -maxdepth 1 -exec ls {} + > /dev/null 2>&1
+define Require/getopt-extended
+	getopt --long - - >/dev/null
 endef
 
-$(eval $(call Require,find, \
-	Please install GNU find 4.2.12 or better. \
+$(eval $(call Require,getopt-extended, \
+	Please install an extended getopt version that supports --long \
 ))