From 7eb47e34d403ce8b30bf8da6e67f3d10610c7bfb Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 17:46:12 +0200 Subject: [PATCH] * Fix usage-wrapper build dependency. --- debian/changelog | 5 +++-- debian/control | 2 +- debian/rules | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c97fd0e3..3c62e1af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-3) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-4) unstable; urgency=medium [ Matthias Klose ] * Consolidate disabling CMake's package validation checks a bit. @@ -10,12 +10,13 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) unstable; urgency=medium * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. * Remove references to alpha, hppa, powerpcspe and sh4. + * Fix usage-wrapper build dependency. [ Aurelien Jarno ] * Enable lldb on riscv64. * Enable lldb autopkgtest on riscv64. - -- Matthias Klose Sun, 08 Sep 2024 17:13:38 +0200 + -- Matthias Klose Sun, 08 Sep 2024 17:36:43 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index ae673305..31508bd7 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, + doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 2544c4b5..2be95708 100755 --- a/debian/rules +++ b/debian/rules @@ -87,6 +87,7 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / 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 +USAGE_BUILD_DEP = $(EMPTY) time, ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND))) ifeq ($(DERIVATIVE),Ubuntu) USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib [!i386],