diff --git a/debian/changelog b/debian/changelog index c1f94df9..125f598e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -llvm-toolchain-5.0 (1:5.0~+rc1-3) UNRELEASED; urgency=medium +llvm-toolchain-5.0 (1:5.0~+rc2-1) unstable; urgency=medium + * New snapshot release + * Force the usage of gcc 6 until the link issues are fixed * Remove the temp-unbreak-5.0-build.diff patch to unbreak the build [ Katsuhiko Nishimra ] diff --git a/debian/control b/debian/control index 5231d68e..65d96aad 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, 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] + g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], + g++-6 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 diff --git a/debian/rules b/debian/rules index 6b37fe03..89276451 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_INST := $(CURDIR)/debian/tmp/ GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o 'g++-[0-9][0-9.]*' | tail -n1 ) GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 ) GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) - +GCC_VERSION := 6 LLVM_VERSION := 5.0 LLVM_VERSION_FULL := $(LLVM_VERSION).0