X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fprereq-build.mk;h=c7d59f12029152fa2887e2374949c378ef918de7;hp=7355b9e31c1e3c8cad24fd54897159717c3d8555;hb=a1bcd25082fd6780d6eb9184acb1813bf723841f;hpb=8857381856cbc12fb8dab9141abd67c3af874e55

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7355b9e31c..c7d59f1202 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,6 +8,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 PKG_NAME:=Build dependency
 
@@ -20,11 +21,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 +38,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,16 +63,38 @@ $(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++, \
 	Please install the GNU C++ Compiler (g++). \
 ))
 
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/working-gcc-static
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		gcc -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out -
+  endef
+
+  $(eval $(call Require,working-gcc-static, \
+    Please install the static libc development package (glibc-static on CentOS/Fedora/RHEL). \
+  ))
+
+  define Require/working-g++-static
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		g++ -x c++ $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lstdc++ && \
+		$(TMP_DIR)/a.out
+  endef
+
+  $(eval $(call Require,working-g++-static, \
+	Please install the static libstdc++ development package (libstdc++-static on CentOS/Fedora/RHEL). \
+  ))
+endif
+
 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,23 +104,26 @@ $(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, \
 	Please install zlib. (Missing libz.so or zlib.h) \
 ))
 
-$(eval $(call RequireCommand,gawk, \
-	Please install GNU awk. \
-))
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/zlib-static
+	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
+		gcc -include zlib.h -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lz
+  endef
 
-$(eval $(call RequireCommand,bison, \
-	Please install GNU bison. \
-))
+  $(eval $(call Require,zlib-static, \
+	Please install a static zlib. (zlib-static on CentOS/Fedora/RHEL). \
+  ))
+endif
 
-$(eval $(call RequireCommand,flex, \
-	Please install flex. \
+$(eval $(call RequireCommand,gawk, \
+	Please install GNU awk. \
 ))
 
 $(eval $(call RequireCommand,unzip, \
@@ -106,10 +142,22 @@ $(eval $(call RequireCommand,perl, \
 	Please install perl. \
 ))
 
+$(eval $(call RequireCommand,python, \
+	Please install python. \
+))
+
 $(eval $(call RequireCommand,wget, \
 	Please install wget. \
 ))
 
+define Require/git
+	git --version | awk '($$$$1 == "git") && ($$$$2 == "version") && ($$$$3 >= "1.6.5") { print "ok" }' | grep ok > /dev/null
+endef
+
+$(eval $(call Require,git, \
+	Please install git (git-core) v1.6.5 or later. \
+))
+
 define Require/gnutar
 	$(TAR) --version 2>&1 | grep GNU > /dev/null
 endef
@@ -118,14 +166,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 \
 ))