From c0c640594363a81b15be79bf3d2cf709b774f209 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Jun 05 2010 11:49:56 +0000
Subject: - Add F-12/x86_64 and F-13 C++ header paths


---

diff --git a/llvm-2.7-cxx_includes.patch b/llvm-2.7-cxx_includes.patch
new file mode 100644
index 0000000..8b36882
--- /dev/null
+++ b/llvm-2.7-cxx_includes.patch
@@ -0,0 +1,36 @@
+--- llvm-2.7/tools/clang/lib/Frontend/InitHeaderSearch.cpp.cxx_includes	2010-03-06 20:38:10.000000000 +0100
++++ llvm-2.7/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-06-05 13:43:03.150438148 +0200
+@@ -524,10 +524,32 @@
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
+                                 "i686-redhat-linux","", "", triple);
+ 
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
++                                "ppc64-redhat-linux", "64", "", triple);
++
+     // Fedora 12 (February-2010+)
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
+                                 "i686-redhat-linux","", "", triple);
+-      
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
++                                "ppc64-redhat-linux", "64", "", triple);
++
++    // Fedora 13
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "i686-redhat-linux","", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "ppc64-redhat-linux", "64", "", triple);
++
+     // openSUSE 11.1 32 bit
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+                                 "i586-suse-linux", "", "", triple);
diff --git a/llvm.spec b/llvm.spec
index 4ba59c4..9a63ae3 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -5,7 +5,7 @@
 
 Name:           llvm
 Version:        2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -15,6 +15,8 @@ Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tgz
 Source1:        http://llvm.org/releases/%{version}/clang-%{version}.tgz
 # Data files should be installed with timestamps preserved
 Patch0:         llvm-2.6-timestamp.patch
+# http://llvm.org/bugs/show_bug.cgi?id=7307
+Patch1:         llvm-2.7-cxx_includes.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -180,6 +182,7 @@ HTML documentation for LLVM's OCaml binding.
 mv clang-%{version} tools/clang
 
 %patch0 -p1 -b .timestamp
+%patch1 -p1 -b .cxx_includes
 
 # Encoding fix
 (cd tools/clang/docs && \
@@ -370,6 +373,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jun  5 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-4
+- Add F-12/x86_64 and F-13 C++ header paths
+
 * Wed May 26 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-3
 - Revert to disabling apidoc by default