rpms/clang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

just accept clang includes moving to /usr/lib64, upstream don't let much else happen

Browse Source
This commit is contained in:
Dave Airlie 2016-01-28 14:02:53 +10:00
parent 4a6eb830c0
commit 7e4861f5f3
2 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang.spec
View File

@ -1,6 +1,6 @@
Name: clang Name: clang
Version: 3.7.1 Version: 3.7.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: NCSA License: NCSA
@ -9,7 +9,6 @@ Source0: http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz
Source100: clang-config.h Source100: clang-config.h
Patch1: patch-headers.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: llvm-devel = %{version} BuildRequires: llvm-devel = %{version}
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
@ -63,7 +62,6 @@ intended to run in tandem with a build of a project or code base.
%prep %prep
%setup -q -n cfe-%{version}.src %setup -q -n cfe-%{version}.src
%patch1 -p1 -b .fix-header
%build %build
mkdir -p _build mkdir -p _build
cd _build cd _build
@ -141,5 +139,11 @@ done
%{_mandir}/man1/scan-build.1.* %{_mandir}/man1/scan-build.1.*
%changelog %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 * Tue Oct 06 2015 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.0-100
- initial version using cmake build system - initial version using cmake build system

29
patch-headers.patch
View File

@ -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)