projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: Add kmod-dwmac-intel
[openwrt/staging/hauke.git]
/
include
/
prereq-build.mk
diff --git
a/include/prereq-build.mk
b/include/prereq-build.mk
index 8fae92ab977087f38f9bac051d57e49c8bc1163b..49340ce3e441ccbaa1833d6eb38d8abd450f627e 100644
(file)
--- a/
include/prereq-build.mk
+++ b/
include/prereq-build.mk
@@
-8,6
+8,13
@@
include $(INCLUDE_DIR)/prereq.mk
SHELL:=sh
PKG_NAME:=Build dependency
SHELL:=sh
PKG_NAME:=Build dependency
+$(eval $(call TestHostCommand,true, \
+ Please install GNU 'coreutils', \
+ $(TRUE)))
+
+$(eval $(call TestHostCommand,false, \
+ Please install GNU 'coreutils', \
+ $(FALSE); [ $$$$$$$$? = 1 ] && $(TRUE)))
# Required for the toolchain
$(eval $(call TestHostCommand,working-make, \
# Required for the toolchain
$(eval $(call TestHostCommand,working-make, \
@@
-25,28
+32,30
@@
$(eval $(call TestHostCommand,proper-umask, \
ifndef IB
$(eval $(call SetupHostCommand,gcc, \
ifndef IB
$(eval $(call SetupHostCommand,gcc, \
- Please install the GNU C Compiler (gcc) 6 or later, \
- $(CC) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
- gcc -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+ Please install the GNU C Compiler (gcc) 8 or later, \
+ $(CC) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+ gcc -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+ gcc-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
gcc --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-gcc, \
gcc --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-gcc, \
- Please reinstall the GNU C Compiler (
6
or later) - \
+ Please reinstall the GNU C Compiler (
8
or later) - \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
- gcc -x c -o $(TMP_DIR)/a.out -))
+
$(STAGING_DIR_HOST)/bin/
gcc -x c -o $(TMP_DIR)/a.out -))
$(eval $(call SetupHostCommand,g++, \
$(eval $(call SetupHostCommand,g++, \
- Please install the GNU C++ Compiler (g++) 6 or later, \
- $(CXX) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
- g++ -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+ Please install the GNU C++ Compiler (g++) 8 or later, \
+ $(CXX) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+ g++ -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+ g++-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
g++ --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-g++, \
g++ --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-g++, \
- Please reinstall the GNU C++ Compiler (
6
or later) - \
+ Please reinstall the GNU C++ Compiler (
8
or later) - \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
- g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
+
$(STAGING_DIR_HOST)/bin/
g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
$(TMP_DIR)/a.out))
$(eval $(call RequireCHeader,ncurses.h, \
$(TMP_DIR)/a.out))
$(eval $(call RequireCHeader,ncurses.h, \
@@
-87,6
+96,10
@@
$(eval $(call TestHostCommand,perl-thread-queue, \
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
+$(eval $(call TestHostCommand,perl-ipc-cmd, \
+ Please install the Perl IPC:Cmd module, \
+ perl -MIPC::Cmd -e 1))
+
$(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \
gtar --version 2>&1 | grep GNU, \
gnutar --version 2>&1 | grep GNU, \
$(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \
gtar --version 2>&1 | grep GNU, \
gnutar --version 2>&1 | grep GNU, \
@@
-168,25
+181,21
@@
$(eval $(call SetupHostCommand,install,Please install GNU 'install', \
$(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
perl --version | grep "perl.*v5"))
$(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
perl --version | grep "perl.*v5"))
-$(eval $(call CleanupPython2))
-
-$(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \
+$(eval $(call SetupHostCommand,python,Please install Python >= 3.7, \
python3.11 -V 2>&1 | grep 'Python 3', \
python3.10 -V 2>&1 | grep 'Python 3', \
python3.9 -V 2>&1 | grep 'Python 3', \
python3.8 -V 2>&1 | grep 'Python 3', \
python3.7 -V 2>&1 | grep 'Python 3', \
python3.11 -V 2>&1 | grep 'Python 3', \
python3.10 -V 2>&1 | grep 'Python 3', \
python3.9 -V 2>&1 | grep 'Python 3', \
python3.8 -V 2>&1 | grep 'Python 3', \
python3.7 -V 2>&1 | grep 'Python 3', \
- python3.6 -V 2>&1 | grep 'Python 3', \
- python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
+ python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?'))
-$(eval $(call SetupHostCommand,python3,Please install Python >= 3.
6
, \
+$(eval $(call SetupHostCommand,python3,Please install Python >= 3.
7
, \
python3.11 -V 2>&1 | grep 'Python 3', \
python3.10 -V 2>&1 | grep 'Python 3', \
python3.9 -V 2>&1 | grep 'Python 3', \
python3.8 -V 2>&1 | grep 'Python 3', \
python3.7 -V 2>&1 | grep 'Python 3', \
python3.11 -V 2>&1 | grep 'Python 3', \
python3.10 -V 2>&1 | grep 'Python 3', \
python3.9 -V 2>&1 | grep 'Python 3', \
python3.8 -V 2>&1 | grep 'Python 3', \
python3.7 -V 2>&1 | grep 'Python 3', \
- python3.6 -V 2>&1 | grep 'Python 3', \
- python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
+ python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?'))
$(eval $(call TestHostCommand,python3-distutils, \
Please install the Python3 distutils module, \
$(eval $(call TestHostCommand,python3-distutils, \
Please install the Python3 distutils module, \
@@
-229,4
+238,4
@@
prereq: $(STAGING_DIR_HOST)/bin/mkhash $(STAGING_DIR_HOST)/bin/xxd
# Install ldconfig stub
$(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
# Install ldconfig stub
$(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
- $(LN) $(
firstword $(wildcard /bin/true /usr/bin/true))
$(STAGING_DIR_HOST)/bin/ldconfig))
+ $(LN) $(
SCRIPT_DIR)/noop.sh
$(STAGING_DIR_HOST)/bin/ldconfig))