From 7e4861f5f30670c469b8cfe48e59bbc79a62ad9f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Jan 2016 14:02:53 +1000
Subject: [PATCH] just accept clang includes moving to /usr/lib64, upstream
 don't let much else happen

---
 clang.spec          | 10 +++++++---
 patch-headers.patch | 29 -----------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 patch-headers.patch

diff --git a/clang.spec b/clang.spec
index 0cd0afa..76c17f4 100644
--- a/clang.spec
+++ b/clang.spec
@@ -1,6 +1,6 @@
 Name:		clang
 Version:	3.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -9,7 +9,6 @@ Source0:	http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz
 
 Source100:	clang-config.h
 
-Patch1:		patch-headers.patch
 BuildRequires:	cmake
 BuildRequires:	llvm-devel = %{version}
 BuildRequires:	libxml2-devel
@@ -63,7 +62,6 @@ intended to run in tandem with a build of a project or code base.
 
 %prep
 %setup -q -n cfe-%{version}.src
-%patch1 -p1 -b .fix-header
 %build
 mkdir -p _build
 cd _build
@@ -141,5 +139,11 @@ done
 %{_mandir}/man1/scan-build.1.*
 
 %changelog
+* Thu Jan 28 2016 Dave Airlie <airlied@redhat.com> 3.7.1-2
+- just accept clang includes moving to /usr/lib64, upstream don't let much else happen
+
+* Thu Jan 28 2016 Dave Airlie <airlied@redhat.com> 3.7.1-1
+- initial build in Fedora.
+
 * Tue Oct 06 2015 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.0-100
 - initial version using cmake build system
diff --git a/patch-headers.patch b/patch-headers.patch
deleted file mode 100644
index 9acab9a..0000000
--- a/patch-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up cfe-3.7.1.src/CMakeLists.txt.fix-header cfe-3.7.1.src/CMakeLists.txt
---- cfe-3.7.1.src/CMakeLists.txt.fix-header	2015-06-12 12:33:38.000000000 -0400
-+++ cfe-3.7.1.src/CMakeLists.txt	2016-01-21 18:41:53.215983596 -0500
-@@ -84,6 +84,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
-   # They are used as destination of target generators.
-   set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-   set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
-+  set(LLVM_LIBRARY_OUTPUT_INCDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib)
-   if(WIN32 OR CYGWIN)
-     # DLL platform -- put DLLs into bin.
-     set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-diff -up cfe-3.7.1.src/lib/Headers/CMakeLists.txt.fix-header cfe-3.7.1.src/lib/Headers/CMakeLists.txt
---- cfe-3.7.1.src/lib/Headers/CMakeLists.txt.fix-header	2015-07-30 18:47:41.000000000 -0400
-+++ cfe-3.7.1.src/lib/Headers/CMakeLists.txt	2016-01-21 19:22:49.261200235 -0500
-@@ -69,7 +69,7 @@ set(files
-   xtestintrin.h
-   )
- 
--set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
-+set(output_dir ${LLVM_LIBRARY_OUTPUT_INCDIR}/clang/${CLANG_VERSION}/include)
- 
- # Generate arm_neon.h
- clang_tablegen(arm_neon.h -gen-arm-neon
-@@ -98,4 +98,4 @@ set_target_properties(clang-headers PROP
- install(
-   FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h
-   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
--  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
-+  DESTINATION lib/clang/${CLANG_VERSION}/include)