From 21abd3c8cabc294cef84d56aba958e8c8593309f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 24 Aug 2020 09:19:38 +0200 Subject: [PATCH] Drop ocaml support in i386 also for branch=11 --- debian/changelog | 7 +++++++ debian/control | 10 +++++----- debian/rules | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index fce607aa..6adaf3af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-11 (1:11.0.0~+rc2-2) UNRELEASED; urgency=medium + + * Disable ocaml support on i386, not reasonable to support it there + (specially for Ubuntu) + + -- Gianfranco Costamagna Mon, 24 Aug 2020 09:19:14 +0200 + llvm-toolchain-11 (1:11.0.0~+rc2-1) unstable; urgency=medium * New snapshot release diff --git a/debian/control b/debian/control index 63a99bb5..a9dd1895 100644 --- a/debian/control +++ b/debian/control @@ -14,10 +14,10 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-recommonmark, doxygen, gfortran, - ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x], - ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], - libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], - dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], + ocaml-nox [amd64 arm64 armhf ppc64el s390x], + ocaml-findlib [amd64 arm64 armhf ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x], + dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev Build-Conflicts: oprofile, ocaml Standards-Version: 4.2.1 @@ -372,7 +372,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-11-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf i386 ppc64el s390x +Architecture: amd64 arm64 armhf ppc64el s390x Suggests: llvm-11-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-11-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index 3ccd900d..9dc8054f 100755 --- a/debian/rules +++ b/debian/rules @@ -260,7 +260,7 @@ endif DH_OPTIONS= OCAML_ENABLE= no -OCAML_ARCHS := amd64 arm64 armhf i386 ppc64el s390x +OCAML_ARCHS := amd64 arm64 armhf ppc64el s390x ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # Enable OCAML for this arch. OCAML_ENABLE=yes