diff --git a/debian/changelog b/debian/changelog index 254baef5..af46f1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4~+rc3-2) UNRELEASED; urgency=medium + + * Remove explicit dep on gcc 4.8 + + -- Sylvestre Ledru Fri, 20 Dec 2013 18:36:58 +0100 + llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low * New testing upstream release diff --git a/debian/control b/debian/control index 5baa71be..5db0caa8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev, libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev, libisl-dev (>= 0.11.1), libjsoncpp-dev, - lcov, procps, help2man, gcc-4.8, g++-4.8, dh-ocaml + lcov, procps, help2man, dh-ocaml +# gcc-4.8, g++-4.8, Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ diff --git a/debian/rules b/debian/rules index cfffaa73..54bba52c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,7 @@ TARGET_BUILD := build-llvm # Force the version of gcc. Some archs are still using gcc 4.6 -GCC_VERSION := 4.8 -# $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') LLVM_VERSION := 3.4 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p')