From b5b19c963db942cf13512ab59f8799df7aec554f Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Mon, 4 Nov 2019 04:19:59 +0000 Subject: [PATCH] Add build-conflicts on python2.7-minimal. --- debian/changelog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 56e7a288b..4e3751102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,10 @@ llvm-toolchain-8 (1:8.0.1-3+rpi1) bullseye-staging; urgency=medium [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] * Change triplet in debian/rules to use armv6k rather than armv7l + [changes introduced in llvm-toolchain-8 1:8.0.1-3+rpi1 by Peter Michael Green] + * Add build-conflicts on python2.7-minimal. If it's installed the build + tries to use it, resulting in a failure. + -- Peter Michael Green Sun, 03 Nov 2019 04:47:04 +0000 llvm-toolchain-8 (1:8.0.1-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 93ea99979..6ea98e9f3 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], libpfm4-dev -Build-Conflicts: oprofile, ocaml +Build-Conflicts: oprofile, ocaml, python2.7-minimal Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 8 -- 2.30.2