Some patches for llvm-toolchain-3.3 and -3.2

[Jon Severinsson]

At Saturday 31 August 2013 10:01:47 Sylvestre Ledru wrote:
> On 31/08/2013 09:30, Jon Severinsson wrote:
> > I have recently been messing around with the llvm packaging, mostly in
> > order to build recent mesa versions on wheezy and jessie, but I have
> > also played a bit with clang. As I did I found some inconcistencies
> > with regards to the gcc version used by llvm. Curently the state of
> > the llvm-toolchain packaging in svn is as follows:
>
> Thanks for all the patches. That is really appreciated.
> 
> I will have a look next week to merge them. Your patches looks good :)

Thanks!

> FYI, the hardcoded usage of gcc-4.7 was due because gcc 4.8 was
> "misscompiling" some C++ code.
> I am not sure that is fixed.

llvm-toolchain-3.3 are already compiled using gcc-4.8 (as it lacks said
hardcoding), and the llvm 3.2 binaries I compiled with gcc 4.8 seems to
work (though I haven't tested them very thoroughly).

Anyway, if 4.7 is still required, my patch makes it much simpler to
consistently use it:

--- a/debian/control
+++ b/debian/control
@@ -10,3 +10,3 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect,
     libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev,
-    libisl-dev (>= 0.11.1), libjsoncpp-dev
+    libisl-dev (>= 0.11.1), libjsoncpp-dev, g++-4.7
 Build-Conflicts: oprofile, ocaml
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,4 @@
 TARGET_BUILD	:= build-llvm
-GCC_VERSION     := $(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')
+GCC_VERSION    := 4.7 # Also add g++-4.7 to Build-Depends in debian/control
 LLVM_VERSION	:= 3.2

Regards
Jon