[llvm] Update to 2.9rc1

Michel Alexandre Salim salimma at fedoraproject.org
Thu Mar 10 21:25:23 UTC 2011


commit 383ea0fe0bb1845c5354fe5bd61ed8aaae566209
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Mar 10 22:25:04 2011 +0100

    Update to 2.9rc1

 .gitignore              |    4 +-
 clang-2.8-alignOf.patch |  199 -----------------------------------------------
 llvm-2.8-alignOf.patch  |   59 --------------
 llvm.spec               |   28 ++++----
 sources                 |    4 +-
 5 files changed, 18 insertions(+), 276 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00ec31b..2564ef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/llvm-2.8.tgz
-/clang-2.8.tgz
+/llvm-2.9rc1.src.tar.gz
+/clang-2.9rc1.src.tar.gz
diff --git a/llvm.spec b/llvm.spec
index 3535c9c..1607ce3 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -10,22 +10,21 @@
   %bcond_without ocaml
 %endif
 
+%global prerel rc1
+%global downloadurl http://llvm.org/%{?prerel:pre-}releases/%{version}
+
 Name:           llvm
-Version:        2.8
-Release:        7%{?dist}
+Version:        2.9
+Release:        0.1.%{prerel}%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tgz
-Source1:        http://llvm.org/releases/%{version}/clang-%{version}.tgz
+Source0:        %{downloadurl}/llvm-%{version}%{?prerel}.src.tar.gz
+Source1:        %{downloadurl}/clang-%{version}%{?prerel}.src.tar.gz
 # Data files should be installed with timestamps preserved
 Patch0:         llvm-2.6-timestamp.patch
-# rename alignof -> alignOf for C++0x support
-# http://llvm.org/bugs/show_bug.cgi?id=8423
-Patch1:         llvm-2.8-alignOf.patch
-Patch2:         clang-2.8-alignOf.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -86,7 +85,7 @@ Summary:        A C language family front-end for LLVM
 License:        NCSA
 Group:          Development/Languages
 # clang requires gcc; clang++ gcc-c++
-Requires:	gcc-c++
+Requires:       gcc-c++
 
 %description -n clang
 clang: noun
@@ -193,13 +192,11 @@ HTML documentation for LLVM's OCaml binding.
 
 
 %prep
-%setup -q -n llvm-%{version} -a1 %{?_with_gcc:-a2}
-mv clang-%{version} tools/clang
+%setup -q -n llvm-%{version}%{?prerel} -a1 %{?_with_gcc:-a2}
+mv clang-%{version}%{?prerel} tools/clang
 
 %patch0 -p1 -b .timestamp
-%patch1 -p0 -b .alignOf
 pushd tools/clang
-%patch2 -p0 -b .alignOf
 popd
 
 # Encoding fix
@@ -341,7 +338,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}/c-index-test
 %{_bindir}/tblgen
 %{_prefix}/lib/clang
 %doc %{_mandir}/man1/clang.1.*
@@ -394,6 +391,9 @@ find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %changelog
+* Thu Mar 10 2011 Michel Salim <salimma at fedoraproject.org> - 2.9-0.1.rc1
+- Update to 2.9rc1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 93dbdb8..60b2250 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-220d361b4d17051ff4bb21c64abe05ba  llvm-2.8.tgz
-10e14c901fc3728eecbd5b829e011b59  clang-2.8.tgz
+1469571f018d1adbf5da624b465ed1eb  llvm-2.9rc1.src.tar.gz
+37240bd17838bcca627eb3fc48aca305  clang-2.9rc1.src.tar.gz


More information about the scm-commits mailing list