From 6d5f9e4244175600f9d7eccfd6d83099acaa5665 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Fri, 12 Jan 2024 09:18:02 +0100 Subject: [PATCH] UBUNTU: [Packaging] temporarily disable Rust dependencies on riscv64 clang-17 / llvm are currently out of sync on riscv64: The following packages have unmet dependencies: clang-17 : Depends: libclang-common-17-dev (= 1:17.0.6-3) but 1:17.0.6-5 is to be installed E: Unable to correct problems, you have held broken packages. To avoid this and unblock the the build simply disable the clang and Rust dependencies on riscv64 for now. Signed-off-by: Andrea Righi --- debian.master/config/annotations | 2 +- debian.master/control.stub.in | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 5e2e22d90b94..0553283d0351 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11258,7 +11258,7 @@ CONFIG_RUST policy<{'amd64': 'y'}> CONFIG_RUSTC_VERSION_TEXT policy<{'amd64': '"rustc 1.73.0 (cc66ad468 2023-10-03) (built from a source tarball)"'}> CONFIG_RUST_BUILD_ASSERT_ALLOW policy<{'amd64': 'n'}> CONFIG_RUST_DEBUG_ASSERTIONS policy<{'amd64': 'n'}> -CONFIG_RUST_IS_AVAILABLE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_RUST_IS_AVAILABLE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> CONFIG_RUST_OVERFLOW_CHECKS policy<{'amd64': 'y'}> CONFIG_RV policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RV_MON_WWNR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index e650fd4e2769..daeeb406e542 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -40,12 +40,12 @@ Build-Depends: curl , zstd , pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , - clang-17, - libclang1-17, - rustc, - rust-src, - rustfmt, - bindgen-0.65, + clang-17 [amd64 arm64 armhf ppc64el s390x], + libclang1-17 [amd64 arm64 armhf ppc64el s390x], + rustc [amd64 arm64 armhf ppc64el s390x], + rust-src [amd64 arm64 armhf ppc64el s390x], + rustfmt [amd64 arm64 armhf ppc64el s390x], + bindgen-0.65 [amd64 arm64 armhf ppc64el s390x], libstdc++-dev, Build-Depends-Indep: xmlto ,