diff options
| author | Paul Spooren <mail@aparcar.org> | 2020-12-12 20:57:21 -1000 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-02-15 16:35:49 -1000 |
| commit | 6dba010157f2ac6485bb3dee6a5ed4450fb09463 (patch) | |
| tree | 57d4c96b67e9f7cf42d8c29e71c4e68bb60963ff | |
| parent | 46b6ee7ffc457af8aad1a0f7e5936f50041141d8 (diff) | |
| download | upstream-6dba010157f2ac6485bb3dee6a5ed4450fb09463.tar.gz upstream-6dba010157f2ac6485bb3dee6a5ed4450fb09463.tar.bz2 upstream-6dba010157f2ac6485bb3dee6a5ed4450fb09463.zip | |
build/prereq: require make 4.1 or later
FS#2086 "IS_TTY in the makefile is broken" reports flawed detection of
stdout piping to a file. The issue describes how e.g. terminal color
codes and up in log files if running make like `make > log.txt`.
The proposed solution uses the make variable "MAKE_TERMOUT", which was
introduced in make 4.1. All major distributions seem to updated to 4.1
or later, so this ideally dosen't break anything.
Signed-off-by: Paul Spooren <mail@aparcar.org>
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/prereq-build.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md index 21acbf4b805..b30819205be 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ the [Build System Setup](https://openwrt.org/docs/guide-developer/build-system/i documentation. ``` -gcc binutils bzip2 flex python3 perl make find grep diff unzip gawk getopt +gcc binutils bzip2 flex python3 perl make4.1+ find grep diff unzip gawk getopt subversion libz-dev libc-dev rsync ``` diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 6dce11cba26..f88e853b520 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -11,8 +11,8 @@ PKG_NAME:=Build dependency # Required for the toolchain $(eval $(call TestHostCommand,working-make, \ - Please install GNU make v3.82 or later. (This version has bugs), \ - $(MAKE) -v | grep -E 'Make (3\.8[2-9]|3\.9[0-9]|[4-9]\.)')) + Please install GNU make v4.1 or later., \ + $(MAKE) -v | grep -E 'Make (4\.[1-9]|[5-9]\.)')) $(eval $(call TestHostCommand,case-sensitive-fs, \ OpenWrt can only be built on a case-sensitive filesystem, \ |