X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fprereq-build.mk;h=84d3f2274c6b3c8f58cc291018881e4d7f84320c;hb=218bf045706c685fc7fd3542671886a4cbb8fa29;hp=e90c3157b050a5e1ebc9097ac6855f5dcf799480;hpb=be9200761382504a7ad0fad4c7a14f8b0f92ce49;p=openwrt.git

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index e90c3157b0..84d3f2274c 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -7,25 +7,48 @@
 
 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
 $(eval $(call Require,non-root, \
-	Building OpenWrt as root is not supported! \
+	Please do not compile as 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, \
-	Your make version is buggy. Please install GNU make v3.81 or later. \
+	Please install GNU make v3.81 or later. (This version has bugs) \
+))
+
+define Require/case-sensitive-fs
+	rm -f $(TMP_DIR)/test.*
+	touch $(TMP_DIR)/test.fs
+	[ \! -f $(TMP_DIR)/test.FS ]
+endef
+
+$(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
@@ -34,50 +57,46 @@ define Require/working-gcc
 endef
 
 $(eval $(call Require,working-gcc, \
-	No working GNU C Compiler (gcc) was found on your system. \
+	Please install the GNU C Compiler (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++, \
-	No working GNU C++ Compiler (g++) was found on your system. \
+	Please install the GNU C++ Compiler (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, \
-	No ncurses development files were not found on your system. \
+	Please install ncurses. (Missing libncurses.so or ncurses.h) \
 ))
 
 
 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, \
-	No zlib development files were not found on your system. \
+	Please install zlib. (Missing libz.so or zlib.h) \
 ))
 
-
-$(eval $(call RequireCommand,bison, \
-	Please install GNU bison. \
+$(eval $(call RequireCommand,gawk, \
+	Please install GNU awk. \
 ))
 
 $(eval $(call RequireCommand,flex, \
 	Please install flex. \
 ))
 
-$(eval $(call RequireCommand,python, \
-	Please install python. \
-))
-
 $(eval $(call RequireCommand,unzip, \
 	Please install unzip. \
 ))
@@ -93,3 +112,39 @@ $(eval $(call RequireCommand,patch, \
 $(eval $(call RequireCommand,perl, \
 	Please install perl. \
 ))
+
+$(eval $(call RequireCommand,python, \
+	Please install python. \
+))
+
+$(eval $(call RequireCommand,wget, \
+	Please install wget. \
+))
+
+define Require/gnutar
+	$(TAR) --version 2>&1 | grep GNU > /dev/null
+endef
+
+$(eval $(call Require,gnutar, \
+	Please install GNU tar. \
+))
+
+$(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/getopt-extended
+	getopt --long - - >/dev/null
+endef
+
+$(eval $(call Require,getopt-extended, \
+	Please install an extended getopt version that supports --long \
+))