[include] image.mk: only upgrade permissions instead of overwriting, utilize tar...

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

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 24b1974..5b3a773 100644 (file)
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -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,10 @@ $(eval $(call RequireCommand,wget, \
        Please install wget. \
 ))
 
        Please install wget. \
 ))
 

+$(eval $(call RequireCommand,git, \
+       Please install git (git-core). \
+))
+

 define Require/gnutar
        $(TAR) --version 2>&1 | grep GNU > /dev/null
 endef
 define Require/gnutar
        $(TAR) --version 2>&1 | grep GNU > /dev/null
 endef


@@ -133,12 +137,8 @@ $(eval $(call RequireCommand,svn, \
        Please install the subversion client. \
 ))
 
        Please install the subversion client. \
 ))
 

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

 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, \