Removing the use of auto in the devtoolset patch

Doesn't actually change anything since lldb requires gcc 4.6 and is disabled on EL6

0003-amazon-triples.patch

@@ -0,0 +1,22 @@
+--- a/tools/clang/lib/Driver/ToolChains.cpp
++++ b/tools/clang/lib/Driver/ToolChains.cpp
+@@ -1124,7 +1124,8 @@
+   static const char *const X86_64Triples[] = {
+     "x86_64-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu",
+     "x86_64-redhat-linux6E", "x86_64-redhat-linux", "x86_64-suse-linux",
+-    "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux"
++    "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux",
++    "x86_64-amazon-linux"
+   };
+   static const char *const X86LibDirs[] = { "/lib32", "/lib" };
+   static const char *const X86Triples[] = {
+@@ -1131,7 +1132,8 @@
+     "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", "i386-linux-gnu",
+     "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux",
+     "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux",
+-    "i686-montavista-linux"
++    "i686-montavista-linux",
++    "i686-amazon-linux"
+   };
+ 
+   static const char *const MIPSLibDirs[] = { "/lib" };

0004-devtoolset.patch

@@ -0,0 +1,21 @@
+--- a/tools/clang/lib/Driver/ToolChains.cpp
++++ b/tools/clang/lib/Driver/ToolChains.cpp
+@@ -1062,6 +1062,18 @@
+     // And finally in /usr.
+     if (D.SysRoot.empty())
+       Prefixes.push_back("/usr");
++
++    // RedHat Developer Toolset support
++    if (const char *software_collections = getenv("X_SCLS")) {
++      SmallVector<StringRef, 4> Scls;
++      StringRef(software_collections).split(Scls, StringRef(" "), -1, false);
++      for (SmallVector<StringRef, 4>::const_iterator SclsIter = Scls.begin(); SclsIter != Scls.end(); ++SclsIter) {
++        if (!SclsIter->startswith(StringRef("devtoolset-")))
++          continue;
++        const std::string SclPath = std::string("/opt/rh/") + SclsIter->str() + std::string("/root/usr");
++        Prefixes.push_back(SclPath);
++      }
++    }
+   }
+ 
+   // Loop over the various components which exist and select the best GCC

0005-scan-build-dir.patch

@@ -0,0 +1,15 @@
+--- a/tools/clang/tools/scan-build/scan-build
++++ b/tools/clang/tools/scan-build/scan-build
+@@ -204,6 +204,12 @@
+   else {
+     $NewDir = "$Dir/$DateString-$RunNumber";
+   }
++
++  # Make sure that the directory does not exist in order to avoid hijack.
++  if (-d $NewDir) {
++      DieDiag("The directory '$NewDir' already exists.\n");
++  }
++
+   system 'mkdir','-p',$NewDir;
+   return $NewDir;
+ }

llvm.spec

@@ -11,16 +11,27 @@
 %else
   %bcond_with ocaml
 %endif
-%ifarch %ix86 x86_64
-  %bcond_without gold
+# If build on Fedora or RHEL 7
+%if 0%{?rhel}%{?fedora} >= 7
+  # gold not available on RHEL 6
+  %ifarch %ix86 x86_64
+    %bcond_without gold
+  %else
+    %bcond_with gold
+  %endif
+  # lldb requires gcc 4.6 or higher
+  # lldb not ported to anything but x86 so far.
+  %ifarch x86_64 %{ix86}
+    %bcond_without lldb
+  %else
+    %bcond_with lldb
+  %endif
+  # gcc 4.4 doesn't understand c++11 (wants c++0x)
+  %bcond_without cxx11
 %else
-  %bcond_with gold
-%endif
-# lldb not ported to anything but x86 so far.
-%ifarch x86_64 %{ix86}
-  %bcond_without lldb
-%else
-  %bcond_with lldb
+# pure 0.55 doesn't work with newer versions of llvm and 0.58 doesn't work with old libstdc++
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1058472
+Obsoletes: pure <= 0.55
 %endif
 
 
@@ -32,10 +43,12 @@
 %endif
 
 #global prerel rc3
+%global version_base 3.4
 %global downloadurl http://llvm.org/%{?prerel:pre-}releases/%{version}%{?prerel:/%{prerel}}
+%global downloadurl_base http://llvm.org/%{?prerel:pre-}releases/%{version_base}%{?prerel:/%{prerel}}
 
 Name:           llvm
-Version:        3.4
+Version:        %{version_base}.2
 Release:        4%{?dist}
 Summary:        The Low Level Virtual Machine
 
@@ -45,10 +58,10 @@ URL:            http://llvm.org/
 
 # source archives
 Source0:        %{downloadurl}/llvm-%{version}%{?prerel}.src.tar.gz
-Source1:        %{downloadurl}/clang-%{version}%{?prerel}.src.tar.gz
-Source2:        %{downloadurl}/compiler-rt-%{version}%{?prerel}.src.tar.gz
+Source1:        %{downloadurl}/cfe-%{version}%{?prerel}.src.tar.gz
+Source2:        %{downloadurl_base}/compiler-rt-%{version_base}%{?prerel}.src.tar.gz
 %if %{with lldb}
-Source3:        %{downloadurl}/lldb-%{version}%{?prerel}.src.tar.gz
+Source3:        %{downloadurl_base}/lldb-%{version_base}%{?prerel}.src.tar.gz
 %endif
 
 # multilib fixes
@@ -58,6 +71,9 @@ Source11:       llvm-Config-llvm-config.h
 # patches
 Patch1:         0001-data-install-preserve-timestamps.patch
 Patch2:         0002-linker-flags-speedup-memory.patch
+Patch3:         0003-amazon-triples.patch
+Patch4:         0004-devtoolset.patch
+Patch5:         0005-scan-build-dir.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -127,9 +143,9 @@ Shared libraries for the LLVM compiler infrastructure.
 
 
 %package static
-Summary:	LLVM static libraries
-Group:		Development/Languages
-Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
+Summary:  LLVM static libraries
+Group:    Development/Languages
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description static
 Static libraries for the LLVM compiler infrastructure.  Not recommended
@@ -270,20 +286,23 @@ HTML documentation for LLVM's OCaml binding.
 
 
 %prep
-%setup -q %{?with_clang:-a1} %{?with_crt:-a2} %{?with_lldb:-a3}
+%setup -q %{?with_clang:-a1} %{?with_crt:-a2} %{?with_lldb:-a3} -n llvm-%{version}.src
 rm -rf tools/clang tools/lldb projects/compiler-rt
 %if %{with clang}
-mv clang-%{version} tools/clang
+mv cfe-%{version}.src tools/clang
 %endif
 %if %{with crt}
-mv compiler-rt-%{version} projects/compiler-rt
+mv compiler-rt-%{version_base} projects/compiler-rt
 %endif
 %if %{with lldb}
-mv lldb-%{version} tools/lldb
+mv lldb-%{version_base} tools/lldb
 %endif
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # fix library paths
 sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure
@@ -294,11 +313,17 @@ sed -i 's|/lib\>|/%{_lib}/%{name}|g' tools/llvm-config/llvm-config.cpp
 # clang is lovely and all, but fedora builds with gcc
 export CC=gcc
 export CXX=c++
+# Add include path for ffi.h
+export CPPFLAGS=-I$(echo %{_libdir}/libffi-*/include)
+export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 %configure \
   --libdir=%{_libdir}/%{name} \
   --disable-polly \
   --disable-libcpp \
+%if %{with cxx11}
   --enable-cxx11 \
+%endif
   --enable-clang-arcmt \
   --enable-clang-static-analyzer \
   --enable-clang-rewriter \
@@ -324,8 +349,6 @@ export CXX=c++
   --disable-embed-stdcxx \
   --enable-timestamps \
   --enable-backtraces \
-  --enable-targets=x86,powerpc,arm,aarch64,cpp,nvptx,systemz \
-  --enable-experimental-targets=R600 \
 %if %{with ocaml}
   --enable-bindings=ocaml \
 %else
@@ -346,7 +369,6 @@ export CXX=c++
 %if %{with gold}
   --with-binutils-include=%{_includedir} \
 %endif
-  --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/*/include) \
   --with-optimize-option=-O3
 
 make %{_smp_mflags} REQUIRES_RTTI=1 VERBOSE=1 \
@@ -422,7 +444,7 @@ mkdir -p %{buildroot}%{_docdir}
 # llvm
 mkdir -p %{buildroot}%{llvmdocdir llvm}
 for f in CREDITS.TXT LICENSE.TXT README.txt; do
-	cp $f %{buildroot}%{llvmdocdir llvm}
+  cp $f %{buildroot}%{llvmdocdir llvm}
 done
 
 # llvm-doc
@@ -649,10 +671,40 @@ exit 0
 %endif
 
 %changelog
-* Fri Jan 31 2014 Kyle McMartin <kyle@redhat.com> 3.4-4
+* Fri Jan 02 2015 Dave Johansen <davejohansen@gmail.com> 3.4.2-4
+- Adding X_SCLS for turning on devtoolset use at runtime
+
+* Thu Nov 20 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-3
+- Fix for CVE-2014-2893
+
+* Sat Nov 15 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-2
+- Adding support for using devtoolset
+
+* Sun Aug 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-1
+- Updated to 3.4.2
+
+* Wed Apr 23 2014 Dave Johansen <davejohansen@gmail.com> 3.4-10
+- Adding support for Amazon Linux
+
+* Wed Feb 05 2014 Dave Johansen <davejohansen@gmail.com> 3.4-9
+- Removing specification of targets
+
+* Tue Feb 04 2014 Dave Johansen <davejohansen@gmail.com> 3.4-8
+- Adding include path for ffi.h
+
+* Mon Feb 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4-7
+- Removing specification of --with-c-include-dirs
+
+* Fri Jan 31 2014 Kyle McMartin <kyle@redhat.com> 3.4-6
 - Disable lldb on everything but x86_64, and i686. It hasn't been ported
   beyond those platforms so far.
 
+* Wed Jan 29 2014 Dave Johansen <davejohansen@gmail.com> 3.4-5
+- Obsoleting pure on EL6
+
+* Sat Jan 18 2014 Dave Johansen <davejohansen@gmail.com> 3.4-4
+- Enable building on EL6
+
 * Fri Jan 17 2014 Dave Airlie <airlied@redhat.com> 3.4-3
 - bump nvr for lldb on ppc disable
 

sources

@@ -1,4 +1,4 @@
-b378f1e2c424e03289effc75268d3d2c  clang-3.4.src.tar.gz
+87945973b7c73038871c5f849a818588  cfe-3.4.2.src.tar.gz
 7ed60a0463f9fdfa20db7109d4624cee  lldb-3.4.src.tar.gz
 7938353e3a3bda85733a165e7ac4bb84  compiler-rt-3.4.src.tar.gz
-46ed668a1ce38985120dbf6344cf6116  llvm-3.4.src.tar.gz
+a20669f75967440de949ac3b1bad439c  llvm-3.4.2.src.tar.gz