diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-05 00:06:27 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 11:01:54 +0100 |
| commit | b4454ca4fae13f85e06d01df8a2a94ddd78d3368 (patch) | |
| tree | 77330c1615e3c3daaaa8033579139e59e5d00b54 /include | |
| parent | 43c96e8dd87ecc66448305484b824606bef8099b (diff) | |
| download | upstream-b4454ca4fae13f85e06d01df8a2a94ddd78d3368.tar.gz upstream-b4454ca4fae13f85e06d01df8a2a94ddd78d3368.tar.bz2 upstream-b4454ca4fae13f85e06d01df8a2a94ddd78d3368.zip | |
build: remove GNU time dependency
Replace the GNU time program invocation with a simple Perl script reporting
the timing values. Since we require Perl anyway for the build system, we can
as well use that instead of requiring a random GNU utility rarely installed
by default.
Fixes: ff6e62b288 ("build: log time taken by each packages/steps")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from d3ddf6631e491a831617a5ae8b3d7924e47a275a)
Diffstat (limited to 'include')
| -rw-r--r-- | include/prereq-build.mk | 5 | ||||
| -rw-r--r-- | include/subdir.mk | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 029249f69c..a416a2d232 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -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' that supports -f, \ - gtime --version 2>&1 | grep GNU, \ - time --version 2>&1 | grep GNU, \ - busybox time 2>&1 | grep -- '-f FMT')) - $(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 dde3e50b0b..6512e24c2e 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));) \ - env time -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \ + $(SCRIPT_DIR)/time.pl "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)" \ $$(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) |