From 57861dbb15ebc253885d4f900995ed216019e6d6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 25 Jul 2023 19:10:06 +0100 Subject: [PATCH] UBUNTU: [Packaging] Use consistent llvm/clang for rust rust-1.62 and bindgen-0.56 were build against llvm-14, continue to use the same llvm at runtime. As bindgen-0.56 has not yet been fixed to use clang-16 at runtime. Signed-off-by: Dimitri John Ledkov [ we do not use rust-1.62 anymore, but we still use bindgen-0.56 ] Signed-off-by: Andrea Righi --- debian.master/control.stub.in | 2 -- debian/rules.d/0-common-vars.mk | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 7e76ffe77384..8efedc6eb19a 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -43,8 +43,6 @@ Build-Depends: rust-src [amd64], rustfmt [amd64], bindgen-0.56 [amd64], - llvm-15 [amd64], - clang-15 [amd64], libstdc++-dev, Build-Depends-Indep: xmlto , diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index e90c884c1cc0..12a5caf2440b 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -238,7 +238,7 @@ kmake = make ARCH=$(build_arch) \ CROSS_COMPILE=$(CROSS_COMPILE) \ HOSTCC=$(HOSTCC) \ CC=$(CROSS_COMPILE)$(gcc) \ - BINDGEN=bindgen-0.56 \ + BINDGEN=bindgen-0.56 CLANG_PATH=clang-14 LIBCLANG_PATH=/usr/lib/llvm-14/lib \ KERNELVERSION=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ KBUILD_BUILD_VERSION="$(uploadnum)" \