Bug#625082: llvm-2.7: diff for NMU version 2.7-6.1

[Stephane Glondu]

tags 625082 + patch
tags 625082 + pending
thanks

Dear maintainer,

This bug will block the transition to OCaml 3.12.1, so it should be
fixed soon (or llvm-2.7 should be removed).

I've prepared an NMU for llvm-2.7 (versioned as 2.7-6.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u llvm-2.7-2.7/debian/changelog llvm-2.7-2.7/debian/changelog
--- llvm-2.7-2.7/debian/changelog
+++ llvm-2.7-2.7/debian/changelog
@@ -1,3 +1,10 @@
+llvm-2.7 (2.7-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.6 (Closes: #625082)
+
+ -- Stéphane Glondu <glondu at debian.org>  Thu, 07 Jul 2011 10:19:52 +0200
+
 llvm-2.7 (2.7-6) unstable; urgency=low
 
   * Upload as 2.7-6, the version mangling code breaks with the previous upload.
diff -u llvm-2.7-2.7/debian/control llvm-2.7-2.7/debian/control
--- llvm-2.7-2.7/debian/control
+++ llvm-2.7-2.7/debian/control
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 6.0.0), flex, bison, dejagnu, tcl8.5, expect,
     autoconf, automake1.9, perl, libtool, doxygen, chrpath, texinfo,
     sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
-    lsb-release, patchutils, diffstat, lzma, llvm-2.7-priv-dev (>= 2.7-5) [alpha amd64 armel hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc], ccache, ocaml-nox (>= 3.11.2), ocaml-best-compilers | ocaml-nox, dh-ocaml (>= 0.9.1)
+    lsb-release, patchutils, diffstat, lzma, llvm-2.7-priv-dev (>= 2.7-) [alpha amd64 armel hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc], ccache, ocaml-nox (>= 3.11.2), ocaml-best-compilers | ocaml-nox, dh-ocaml (>= 0.9.1)
 Build-Conflicts: oprofile
 Standards-Version: 3.9.1
 Homepage: http://www.llvm.org/
only in patch2:
unchanged:
--- llvm-2.7-2.7.orig/debian/patches/0050-Fix-build-with-gcc-4.6.patch
+++ llvm-2.7-2.7/debian/patches/0050-Fix-build-with-gcc-4.6.patch
@@ -0,0 +1,58 @@
+---
+ include/llvm/ADT/DenseMap.h           |    1 +
+ include/llvm/ADT/SmallVector.h        |    1 +
+ include/llvm/ADT/ilist.h              |    1 +
+ include/llvm/Use.h                    |    1 +
+ lib/Target/ARM/ARMConstantPoolValue.h |    1 +
+ 5 files changed, 5 insertions(+)
+
+--- llvm-2.7-2.7.orig/lib/Target/ARM/ARMConstantPoolValue.h
++++ llvm-2.7-2.7/lib/Target/ARM/ARMConstantPoolValue.h
+@@ -15,6 +15,7 @@
+ #define LLVM_TARGET_ARM_CONSTANTPOOLVALUE_H
+ 
+ #include "llvm/CodeGen/MachineConstantPool.h"
++#include <stddef.h>
+ 
+ namespace llvm {
+ 
+--- llvm-2.7-2.7.orig/include/llvm/Use.h
++++ llvm-2.7-2.7/include/llvm/Use.h
+@@ -28,6 +28,7 @@
+ #include "llvm/Support/Casting.h"
+ #include "llvm/ADT/PointerIntPair.h"
+ #include <iterator>
++#include <stddef.h>
+ 
+ namespace llvm {
+ 
+--- llvm-2.7-2.7.orig/include/llvm/ADT/ilist.h
++++ llvm-2.7-2.7/include/llvm/ADT/ilist.h
+@@ -40,6 +40,7 @@
+ 
+ #include <cassert>
+ #include <iterator>
++#include <stddef.h>
+ 
+ namespace llvm {
+ 
+--- llvm-2.7-2.7.orig/include/llvm/ADT/DenseMap.h
++++ llvm-2.7-2.7/include/llvm/ADT/DenseMap.h
+@@ -23,6 +23,7 @@
+ #include <utility>
+ #include <cassert>
+ #include <cstring>
++#include <stddef.h>
+ 
+ namespace llvm {
+ 
+--- llvm-2.7-2.7.orig/include/llvm/ADT/SmallVector.h
++++ llvm-2.7-2.7/include/llvm/ADT/SmallVector.h
+@@ -19,6 +19,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <memory>
++#include <stddef.h>
+ 
+ #ifdef _MSC_VER
+ namespace std {