taken from the trunk: also handle /usr/bin/time

This commit is contained in:
Matthias Klose 2024-09-10 14:26:51 +02:00
parent 30a2a8745b
commit e5c103dee3

5
debian/rules vendored
View File

@ -86,7 +86,8 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' /
'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null) 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null)
TIME_COMMAND = $(CURDIR)/debian/usage-wrapper.py $(SUMMARY_ONLY) -j $(NJOBS) --base-memory -m 4.0 -o usage-$(notdir $@)-$(DEB_HOST_ARCH).svg TIME_COMMAND = $(CURDIR)/debian/usage-wrapper.py $(SUMMARY_ONLY) -j $(NJOBS) --base-memory -m 4.0 -o usage-$(notdir $@)-$(DEB_HOST_ARCH).svg
TIME_COMMAND = /bin/time -v TIME_BIN := $(if $(wildcard /usr/bin/time),/usr/bin/time,/bin/time)
TIME_COMMAND = $(TIME_BIN) -v
USAGE_BUILD_DEP = $(EMPTY) time, USAGE_BUILD_DEP = $(EMPTY) time,
ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND))) ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND)))
ifeq ($(DERIVATIVE),Ubuntu) ifeq ($(DERIVATIVE),Ubuntu)
@ -97,7 +98,7 @@ ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND)))
else else
USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil [!hurd-i386 !hurd-amd64], python3-matplotlib [!m68k !sh4 !x32 !hurd-i386 !hurd-amd64], USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil [!hurd-i386 !hurd-amd64], python3-matplotlib [!m68k !sh4 !x32 !hurd-i386 !hurd-amd64],
ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 hurd-amd64)) ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 hurd-amd64))
TIME_COMMAND = /bin/time -v TIME_COMMAND = $(TIME_BIN) -v
endif endif
ifneq (,$(filter $(DEB_HOST_ARCH), m68k sh4 x32)) ifneq (,$(filter $(DEB_HOST_ARCH), m68k sh4 x32))
SUMMARY_ONLY = --summary-only SUMMARY_ONLY = --summary-only