X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fprereq-build.mk;h=f7da916f648c5c67f73938308fe2df26177204bb;hp=72875aef4e67b0f20bf1ce63a770aacd9d0ad42e;hb=6570f3c93aa4110efd1466a6b89742c2e11d7c11;hpb=591780615b304fb4624e363135942e9ee8f6caa3 diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 72875aef4e..f7da916f64 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -24,10 +24,10 @@ $(eval $(call TestHostCommand,case-sensitive-fs, \ $(eval $(call TestHostCommand,proper-umask, \ Please build with umask 022 - other values produce broken packages, \ - umask | grep -xE 00[012][012])) + umask | grep -xE 0?0[012][012])) $(eval $(call SetupHostCommand,gcc, \ - Please install the GNU C Compiler (gcc) 4.8 or later \ + Please install the GNU C Compiler (gcc) 4.8 or later, \ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ gcc -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ gcc48 --version | grep gcc, \ @@ -46,7 +46,7 @@ $(eval $(call TestHostCommand,working-gcc, \ gcc -x c -o $(TMP_DIR)/a.out -)) $(eval $(call SetupHostCommand,g++, \ - Please install the GNU C++ Compiler (g++) 4.8 or later \ + Please install the GNU C++ Compiler (g++) 4.8 or later, \ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ g++48 --version | grep g++, \ @@ -138,11 +138,6 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \ wget --version | grep GNU)) -$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time', \ - gtime --version 2>&1 | grep GNU, \ - time --version 2>&1 | grep GNU, \ - busybox time 2>&1 | grep BusyBox)) - $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5"))