From cffdd76e5a742a5dfef8aa18de4ce3c1a436c2b6 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 5 Sep 2017 20:53:25 +0000 Subject: [PATCH] Enable ocaml binding for release architectures --- debian/changelog | 6 ++++++ debian/control | 10 +++++----- debian/rules | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d39ea0ff..563a2222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:6.0~svn311834-3) UNRELEASED; urgency=medium + + * Enable ocaml on release architectures. + + -- Gianfranco Costamagna Tue, 05 Sep 2017 22:52:49 +0200 + llvm-toolchain-snapshot (1:6.0~svn311834-2) unstable; urgency=medium * Fix the FTBFS because of -gsplit-dwarf: diff --git a/debian/control b/debian/control index ff6943c8..f665b6fe 100644 --- a/debian/control +++ b/debian/control @@ -9,10 +9,10 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libedit-dev, libncurses5-dev, swig, python-six, python-sphinx, binutils-dev, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, - ocaml-nox [amd64 arm64 armel armhf i386], - ocaml-findlib [amd64 arm64 armel armhf i386], - libctypes-ocaml-dev [amd64 arm64 armel armhf i386], - dh-ocaml [amd64 arm64 armel armhf i386], + ocaml-nox [amd64 arm64 armel armhf i386 ppc64el s390x], + ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], + dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev @@ -341,7 +341,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-6.0-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armel armhf i386 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x Suggests: llvm-6.0-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-6.0-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index e5a454f9..58fe6f51 100755 --- a/debian/rules +++ b/debian/rules @@ -156,7 +156,7 @@ LLD_ENABLE=yes DH_OPTIONS= OCAML_ENABLE= no -OCAML_ARCHS := amd64 arm64 armel armhf i386 +OCAML_ARCHS := amd64 arm64 armel armhf i386 ppc64el s390x ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # Enable OCAML for this arch. OCAML_ENABLE=yes