Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

prereq-build: g++ formatting and consistency fixes

Browse Source 
Remove \n that mangles output, and fix inconsistent version name check.

Example before:

Build dependency: Please install the GNU C++ Compiler (g++) 6 or later
Build dependency: \nPlease reinstall the GNU C++ Compiler (4.8 or later) - it appears to be broken
Build dependency: Please install ncurses. (Missing libncurses.so or ncurses.h)

Signed-off-by: Karl Palsson <karlp@tweak.net.au>
This commit is contained in:
Karl Palsson 2021-05-17 00:38:03 +00:00 committed by Hauke Mehrtens
parent 080a0b74e3
commit 81d0ddc806
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/prereq-build.mk
View File

@ -31,7 +31,7 @@ $(eval $(call SetupHostCommand,gcc, \
gcc --version | grep -E 'Apple.(LLVM|clang)' )) gcc --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-gcc, \ $(eval $(call TestHostCommand,working-gcc, \
\nPlease reinstall the GNU C Compiler (6 or later) - \ Please reinstall the GNU C Compiler (6 or later) - \
it appears to be broken, \ it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \ echo 'int main(int argc, char **argv) { return 0; }' | \
gcc -x c -o $(TMP_DIR)/a.out -)) gcc -x c -o $(TMP_DIR)/a.out -))
@ -43,7 +43,7 @@ $(eval $(call SetupHostCommand,g++, \
g++ --version | grep -E 'Apple.(LLVM|clang)' )) g++ --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-g++, \ $(eval $(call TestHostCommand,working-g++, \
\nPlease reinstall the GNU C++ Compiler (4.8 or later) - \ Please reinstall the GNU C++ Compiler (6 or later) - \
it appears to be broken, \ it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \ 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++ && \