[package] libpcap: explicitely disable libnl support to prevent different build resul...

[openwrt.git] / include / prereq-build.mk

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 1cdcd0f..2391e09 100644 (file)
--- 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -20,7 +20,7 @@ $(eval $(call Require,non-root, \
 
 # Required for the toolchain
 define Require/working-make
 
 # Required for the toolchain
 define Require/working-make

-       $(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 = "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
+       $(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 == "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null

 endef
 
 $(eval $(call Require,working-make, \
 endef
 
 $(eval $(call Require,working-make, \


@@ -62,7 +62,7 @@ $(eval $(call Require,working-gcc, \
 
 define Require/working-g++
        echo 'int main(int argc, char **argv) { return 0; }' | \
 
 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
 
                $(TMP_DIR)/a.out
 endef
 


@@ -72,7 +72,7 @@ $(eval $(call Require,working-g++, \
 
 define Require/ncurses
        echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
 
 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, \
 endef
 
 $(eval $(call Require,ncurses, \


@@ -82,7 +82,7 @@ $(eval $(call Require,ncurses, \
 
 define Require/zlib
        echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
 
 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, \
 endef
 
 $(eval $(call Require,zlib, \


@@ -121,6 +121,14 @@ $(eval $(call RequireCommand,wget, \
        Please install 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
 define Require/gnutar
        $(TAR) --version 2>&1 | grep GNU > /dev/null
 endef


@@ -134,7 +142,7 @@ $(eval $(call RequireCommand,svn, \
 ))
 
 define Require/gnu-find
 ))
 
 define Require/gnu-find

-       $(FIND) $(TMP_DIR) -lname foo
+       $(FIND) --version 2>/dev/null

 endef
 
 $(eval $(call Require,gnu-find, \
 endef
 
 $(eval $(call Require,gnu-find, \


@@ -148,7 +156,3 @@ endef
 $(eval $(call Require,getopt-extended, \
        Please install an extended getopt version that supports --long \
 ))
 $(eval $(call Require,getopt-extended, \
        Please install an extended getopt version that supports --long \
 ))

-
-$(eval $(call RequireCommand,m4, \
-       Please install GNU m4 \
-))