* Force the deactivation of ocaml until the transition is done

* Standards-Version: 4.1.0
This commit is contained in:
Sylvestre Ledru 2017-10-13 19:26:15 +00:00
parent ef58425048
commit 8ea018b3ba
3 changed files with 33 additions and 24 deletions

7
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Fri, 13 Oct 2017 21:22:54 +0200
llvm-toolchain-4.0 (1:4.0.1-6) unstable; urgency=medium llvm-toolchain-4.0 (1:4.0.1-6) unstable; urgency=medium
* Remove the -Wl option to call gold instead of the normal linker * Remove the -Wl option to call gold instead of the normal linker

48
debian/control vendored
View File

@ -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, libedit-dev, libncurses5-dev, swig, python-six, python-sphinx, binutils-dev,
libjsoncpp-dev, libjsoncpp-dev,
lcov, procps, help2man, zlib1g-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-nox [amd64 arm64 armel armhf i386],
ocaml-findlib [amd64 arm64 armel armhf i386], ocaml-findlib [amd64 arm64 armel armhf i386],
libctypes-ocaml-dev [amd64 arm64 armel armhf i386], libctypes-ocaml-dev [amd64 arm64 armel armhf i386],
dh-ocaml [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, Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
libllvm-3.8-ocaml-dev, libllvm-3.9-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/ Homepage: http://www.llvm.org/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/4.0/ 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/ 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. This package provides tools for testing.
Package: libllvm-4.0-ocaml-dev # Package: libllvm-4.0-ocaml-dev
Section: ocaml # Section: ocaml
Architecture: amd64 arm64 armel armhf i386 # Architecture: amd64 arm64 armel armhf i386
Suggests: llvm-4.0-doc # Suggests: llvm-4.0-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version}) # Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version})
Replaces: libllvm-x.y-ocaml-dev # Replaces: libllvm-x.y-ocaml-dev
Conflicts: libllvm-x.y-ocaml-dev # Conflicts: libllvm-x.y-ocaml-dev
Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev # Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev
Description: Modular compiler and toolchain technologies, OCaml bindings # Description: Modular compiler and toolchain technologies, OCaml bindings
LLVM is a collection of libraries and tools that make it easy to build # LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other # compilers, optimizers, just-in-time code generators, and many other
compiler-related programs. # compiler-related programs.
. # .
LLVM uses a single, language-independent virtual instruction set both # LLVM uses a single, language-independent virtual instruction set both
as an offline code representation (to communicate code between # as an offline code representation (to communicate code between
compiler phases and to run-time systems) and as the compiler internal # compiler phases and to run-time systems) and as the compiler internal
representation (to analyze and transform programs). This persistent # representation (to analyze and transform programs). This persistent
code representation allows a common set of sophisticated compiler # code representation allows a common set of sophisticated compiler
techniques to be applied at compile-time, link-time, install-time, # techniques to be applied at compile-time, link-time, install-time,
run-time, or "idle-time" (between program runs). # run-time, or "idle-time" (between program runs).
. # .
This package provides the OCaml bindings to develop applications using llvm. # This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-4.0-doc Package: llvm-4.0-doc
Section: doc Section: doc

2
debian/rules vendored
View File

@ -170,6 +170,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS)))
OCAML_STDLIB_DIR ?= $(shell ocamlc -where) OCAML_STDLIB_DIR ?= $(shell ocamlc -where)
DH_OPTIONS=--with ocaml DH_OPTIONS=--with ocaml
endif endif
# Force the deactivation of ocaml until the transition is done
OCAML_ENABLE=no
LIBFUZZER_ENABLE=yes LIBFUZZER_ENABLE=yes
ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux)) ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux))