Merge branch 'master' into f14
Conflicts: llvm.spec
This commit is contained in:
commit
bbe1677554
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
clang-2.7.tgz
|
||||
llvm-2.7.tgz
|
||||
/llvm-2.8.tgz
|
||||
/clang-2.8.tgz
|
||||
|
25
llvm.spec
25
llvm.spec
@ -11,8 +11,8 @@
|
||||
%endif
|
||||
|
||||
Name: llvm
|
||||
Version: 2.7
|
||||
Release: 11%{?dist}
|
||||
Version: 2.8
|
||||
Release: 3%{?dist}
|
||||
Summary: The Low Level Virtual Machine
|
||||
|
||||
Group: Development/Languages
|
||||
@ -22,7 +22,6 @@ 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
|
||||
Patch1: clang-2.7-nodebug.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: chrpath
|
||||
@ -192,14 +191,11 @@ HTML documentation for LLVM's OCaml binding.
|
||||
mv clang-%{version} tools/clang
|
||||
|
||||
%patch0 -p1 -b .timestamp
|
||||
pushd tools/clang
|
||||
%patch1 -p2 -b .nodebug
|
||||
popd
|
||||
|
||||
# Encoding fix
|
||||
(cd tools/clang/docs && \
|
||||
iconv -f ISO88591 -t UTF8 BlockImplementation.txt \
|
||||
-o BlockImplementation.txt)
|
||||
#(cd tools/clang/docs && \
|
||||
# iconv -f ISO88591 -t UTF8 BlockImplementation.txt \
|
||||
# -o BlockImplementation.txt)
|
||||
|
||||
|
||||
%build
|
||||
@ -334,6 +330,7 @@ find examples -name 'Makefile' | xargs -0r rm -f
|
||||
%defattr(-,root,root,-)
|
||||
%doc clang-docs/* clang-testlog.txt
|
||||
%{_bindir}/clang*
|
||||
%{_bindir}/c-index-test
|
||||
%{_bindir}/tblgen
|
||||
%{_prefix}/lib/clang
|
||||
%doc %{_mandir}/man1/clang.1.*
|
||||
@ -386,14 +383,16 @@ find examples -name 'Makefile' | xargs -0r rm -f
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 15 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-11
|
||||
* Fri Oct 15 2010 Michel Salim <salimma@fedoraproject.org> - 2.8-3
|
||||
- Re-add omitted %%{_includedir}
|
||||
|
||||
* Thu Oct 14 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-10
|
||||
* Thu Oct 14 2010 Michel Salim <salimma@fedoraproject.org> - 2.8-2
|
||||
- Add correct C include directory at compile time (# 641500)
|
||||
- Upstream patch so -g flag is not passed to assembler (# 605266)
|
||||
|
||||
* Wed Sep 29 2010 jkeating - 2.7-9.1
|
||||
* Tue Oct 12 2010 Michel Salim <salimma@fedoraproject.org> - 2.8-1
|
||||
- Update to 2.8 release
|
||||
|
||||
* Wed Sep 29 2010 jkeating - 2.7-10
|
||||
- Rebuilt for gcc bug 634757
|
||||
|
||||
* Mon Sep 20 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-9
|
||||
|
Loading…
Reference in New Issue
Block a user