From 8ea018b3ba3ce3ef6d7799a55b8600530995ef89 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 13 Oct 2017 19:26:15 +0000 Subject: [PATCH] * Force the deactivation of ocaml until the transition is done * Standards-Version: 4.1.0 --- debian/changelog | 7 +++++++ debian/control | 48 ++++++++++++++++++++++++------------------------ debian/rules | 2 ++ 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8770879..c72bc370 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-4.0 (1:4.0.1-7) unstable; urgency=medium + + * Force the deactivation of ocaml until the transition is done + * Standards-Version: 4.1.0 + + -- Sylvestre Ledru Fri, 13 Oct 2017 21:22:54 +0200 + llvm-toolchain-4.0 (1:4.0.1-6) unstable; urgency=medium * Remove the -Wl option to call gold instead of the normal linker diff --git a/debian/control b/debian/control index c451ebe4..7d2a8970 100644 --- a/debian/control +++ b/debian/control @@ -9,14 +9,14 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libedit-dev, libncurses5-dev, swig, python-six, python-sphinx, binutils-dev, libjsoncpp-dev, lcov, procps, help2man, zlib1g-dev, + g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], 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], - 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 -Standards-Version: 4.0.0 +Standards-Version: 4.1.0 Homepage: http://www.llvm.org/ Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/4.0/ Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/4.0/ @@ -343,28 +343,28 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-4.0-ocaml-dev -Section: ocaml -Architecture: amd64 arm64 armel armhf i386 -Suggests: llvm-4.0-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version}) -Replaces: libllvm-x.y-ocaml-dev -Conflicts: libllvm-x.y-ocaml-dev -Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev -Description: Modular compiler and toolchain technologies, OCaml bindings - LLVM is a collection of libraries and tools that make it easy to build - compilers, optimizers, just-in-time code generators, and many other - compiler-related programs. - . - LLVM uses a single, language-independent virtual instruction set both - as an offline code representation (to communicate code between - compiler phases and to run-time systems) and as the compiler internal - representation (to analyze and transform programs). This persistent - code representation allows a common set of sophisticated compiler - techniques to be applied at compile-time, link-time, install-time, - run-time, or "idle-time" (between program runs). - . - This package provides the OCaml bindings to develop applications using llvm. +# Package: libllvm-4.0-ocaml-dev +# Section: ocaml +# Architecture: amd64 arm64 armel armhf i386 +# Suggests: llvm-4.0-doc +# Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version}) +# Replaces: libllvm-x.y-ocaml-dev +# Conflicts: libllvm-x.y-ocaml-dev +# Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev +# Description: Modular compiler and toolchain technologies, OCaml bindings +# LLVM is a collection of libraries and tools that make it easy to build +# compilers, optimizers, just-in-time code generators, and many other +# compiler-related programs. +# . +# LLVM uses a single, language-independent virtual instruction set both +# as an offline code representation (to communicate code between +# compiler phases and to run-time systems) and as the compiler internal +# representation (to analyze and transform programs). This persistent +# code representation allows a common set of sophisticated compiler +# techniques to be applied at compile-time, link-time, install-time, +# run-time, or "idle-time" (between program runs). +# . +# This package provides the OCaml bindings to develop applications using llvm. Package: llvm-4.0-doc Section: doc diff --git a/debian/rules b/debian/rules index a435accf..eebaf11a 100755 --- a/debian/rules +++ b/debian/rules @@ -170,6 +170,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) OCAML_STDLIB_DIR ?= $(shell ocamlc -where) DH_OPTIONS=--with ocaml endif +# Force the deactivation of ocaml until the transition is done +OCAML_ENABLE=no LIBFUZZER_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux))