From c9ba2bd78cb4847ad67aa9e99a3e81c7bfbcbfca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 05:56:15 +0200 Subject: Merging debian version 1.70.0+dfsg1-8. Signed-off-by: Daniel Baumann --- debian/changelog | 8 ++++++++ debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 679b105ab..9ddf15a33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +rustc (1.70.0+dfsg1-8) unstable; urgency=medium + + * d/control: switch to libllvm16t64 + * d/control: switch to pkgconf + * d/rules: fix make warning in filter invocation + + -- Fabian Grünbichler Fri, 15 Mar 2024 17:18:37 +0100 + rustc (1.70.0+dfsg1-7~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 050af7f13..76fa4e762 100644 --- a/debian/control +++ b/debian/control @@ -23,11 +23,11 @@ Build-Depends: llvm-16-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] , gcc-mingw-w64-i686-posix:native [i386] , - libllvm16 (>= 1:16.0.0), + libllvm16t64 (>= 1:16.0.0), libclang-rt-16-dev:native, cmake (>= 3.0) | cmake3, # needed by some vendor crates - pkg-config, + pkgconf, # this is sometimes needed by rustc_llvm zlib1g-dev:native, zlib1g-dev, diff --git a/debian/rules b/debian/rules index 8384119b3..b728731aa 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,7 @@ ifeq (armhf,$(DEB_TARGET_ARCH)) CLANG_RT_ARCH = armhf endif -ifneq (,$(filter $(DEB_TARGET_ARCH), sparc64 mips64el))) +ifneq (,$(filter $(DEB_TARGET_ARCH),sparc64 mips64el)) # sparc64: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061125 # mips64el: has profiler, but buggy atm (32-bit overflow in some counter?) CLANG_RT_ARCH = -- cgit v1.2.3