aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Boyett <agb@agb.io>2018-05-16 22:09:57 -0700
committerJohn Crispin <john@phrozen.org>2018-06-18 21:31:49 +0200
commit25eb240f63adaa51882b7c9dee9a2e0b578b5ed1 (patch)
tree33b90a4d77bf8cf7fa793b80488734d8d3d0be21
parent97cb9d04eed0715f508f8dae91b56530f163adc3 (diff)
downloadupstream-25eb240f63adaa51882b7c9dee9a2e0b578b5ed1.tar.gz
upstream-25eb240f63adaa51882b7c9dee9a2e0b578b5ed1.tar.bz2
upstream-25eb240f63adaa51882b7c9dee9a2e0b578b5ed1.zip
build: add busybox support to `time` prereq-check
Busybox time supports the GNU time '-f' syntax used by the build time logging implemented in ff6e62b288c, however the prerequisite check added only works with GNU time installed as `time` or `gtime`. As busybox is a multicall binary, the name of the symlink setup by SetupHostCommand also must be changed from `gtime` to `time` to fix the value of argv[0]. This causes a number of shells (including bash) to use their builtin impelementation of time, so the sole invocation has been changed to use `env time` to use the value found on the $PATH. Signed-off-by: Andy Boyett <agb@agb.io> (cherry picked from commit 591780615b304fb4624e363135942e9ee8f6caa3)
-rw-r--r--include/prereq-build.mk5
-rw-r--r--include/subdir.mk2
2 files changed, 4 insertions, 3 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index bac5fdc84c..72875aef4e 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -138,9 +138,10 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \
$(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
wget --version | grep GNU))
-$(eval $(call SetupHostCommand,gtime,Please install GNU 'time', \
+$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time', \
gtime --version 2>&1 | grep GNU, \
- time --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"))
diff --git a/include/subdir.mk b/include/subdir.mk
index ed4f7537d5..dde3e50b0b 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -43,7 +43,7 @@ log_make = \
$(if $(BUILD_LOG), \
set -o pipefail; \
mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \
- gtime -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \
+ env time -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \
$$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \
$(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt)