rpms/llvm/F-12 .cvsignore, 1.8, 1.9 llvm.spec, 1.36, 1.37 sources, 1.8, 1.9 llvm-2.5-tclsh_check.patch, 1.1, NONE llvm-2.6-destdir-clang.patch, 1.1, NONE llvm-2.6-destdir.patch, 1.1, NONE

Sun May 2 21:33:15 UTC 2010

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19516/F-12

Modified Files:
	.cvsignore llvm.spec sources 
Removed Files:
	llvm-2.5-tclsh_check.patch llvm-2.6-destdir-clang.patch 
	llvm-2.6-destdir.patch 
Log Message:
* Sun May  2 2010 Michel Salim <salimma at fedoraproject.org> - 2.7-1
- Update to final 2.7 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9

--- .cvsignore	7 Sep 2009 06:59:47 -0000	1.8
+++ .cvsignore	2 May 2010 21:33:15 -0000	1.9
@@ -1,2 +1,2 @@
-llvm-2.6.tar.gz
-clang-2.6.tar.gz
+clang-2.7.tgz
+llvm-2.7.tgz


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-12/llvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- llvm.spec	10 Sep 2009 04:08:51 -0000	1.36
+++ llvm.spec	2 May 2010 21:33:15 -0000	1.37
@@ -4,22 +4,17 @@
 #   The doxygen docs are HUGE, so they are not built by default.
 
 Name:           llvm
-Version:        2.6
-Release:        0.5.pre1%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/prereleases/%{version}/llvm-%{version}.tar.gz
-Source1:        http://llvm.org/prereleases/%{version}/clang-%{version}.tar.gz
-# http://llvm.org/bugs/show_bug.cgi?id=3153
-Patch0:         llvm-2.6-destdir.patch
-Patch1:         llvm-2.6-destdir-clang.patch
-# http://llvm.org/bugs/show_bug.cgi?id=4911
-Patch2:         llvm-2.5-tclsh_check.patch
+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
-Patch3:         llvm-2.6-timestamp.patch
+Patch0:         llvm-2.6-timestamp.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -53,6 +48,7 @@ Summary:        Libraries and header fil
 Group:          Development/Languages
 Requires:       %{name} = %{version}-%{release}
 Requires:       libstdc++-devel >= 3.4
+Provides:       llvm-static = %{version}-%{release}
 
 
 %description devel
@@ -70,7 +66,7 @@ Documentation for the LLVM compiler infr
 
 
 %package -n clang
-Summary:        A C language family frontend for LLVM
+Summary:        A C language family front-end for LLVM
 License:        NCSA
 Group:          Development/Languages
 
@@ -82,7 +78,16 @@ clang: noun
 
 The goal of the Clang project is to create a new C, C++, Objective C
 and Objective C++ front-end for the LLVM compiler. Its tools are built
-as libraries and designed to be loosely-coupled and extendable.
+as libraries and designed to be loosely-coupled and extensible.
+
+
+%package -n clang-devel
+Summary:        Header files for clang
+Group:          Development/Languages
+Requires:       clang = %{version}-%{release}
+
+%description -n clang-devel
+This package contains header files for the Clang compiler.
 
 
 %package -n clang-analyzer
@@ -137,6 +142,7 @@ Summary:        Development files for %{
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       %{name}-ocaml = %{version}-%{release}
+Requires:       ocaml
 
 %description    ocaml-devel
 The %{name}-ocaml-devel package contains libraries and signature files
@@ -155,19 +161,19 @@ HTML documentation for LLVM's OCaml bind
 
 %prep
 %setup -q -n llvm-%{version} -a1 %{?_with_gcc:-a2}
-mv clang-2.6 tools/clang
+mv clang-%{version} tools/clang
 
-%patch0 -p0 -b .destdir
-pushd tools/clang
-%patch1 -p0 -b .destdir-clang
-popd
-%patch2 -p1 -b .tclsh_check
-%patch3 -p1 -b .timestamp
+%patch0 -p1 -b .timestamp
+
+# Encoding fix
+(cd tools/clang/docs && \
+    iconv -f ISO88591 -t UTF8 BlockImplementation.txt \
+    -o BlockImplementation.txt)
 
 
 %build
 # Disabling assertions now, rec. by pure and needed for OpenGTL
-# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
+# TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801
 mkdir obj && cd obj
 ../configure \
   --prefix=%{_prefix} \
@@ -175,9 +181,7 @@ mkdir obj && cd obj
   --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
-%ifarch %{ix86}
-  --enable-pic=no
-%endif
+  --enable-shared
 
 # FIXME file this
 # configure does not properly specify libdir
@@ -192,14 +196,10 @@ make %{_smp_mflags} \
 
 
 %check
-# some tests fail on PPC
-# http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
 cd obj
-%ifnarch ppc
-make check
-%endif
-# some clang tests still fail, preserve test results
-(cd tools/clang && make test 2>&1) | tee ../testlog.txt || true
+# no current unexpected failures. Use || true if they recur to force ignore
+make check 2>&1 | tee ../llvm-testlog.txt
+(cd tools/clang && make test 2>&1) | tee ../clang-testlog.txt
 
 
 %install
@@ -211,27 +211,23 @@ make install DESTDIR=%{buildroot} \
      PROJ_docsdir=/moredocs
 popd
 
+# Create ld.so.conf.d entry
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf << EOF
+%{_libdir}/llvm
+EOF
+
 # Static analyzer not installed by default:
 # http://clang-analyzer.llvm.org/installation#OtherPlatforms
-mkdir -p %{buildroot}%{_libdir}/clang-analyzer/libexec
-# link clang-cc for scan-build to find
-ln -s %{_libexecdir}/clang-cc %{buildroot}%{_libdir}/clang-analyzer/libexec/
+mkdir -p %{buildroot}%{_libdir}/clang-analyzer
 # create launchers
 for f in scan-{build,view}; do
-  ln -s %{_libdir}/clang-analyzer/$f %{buildroot}%{_bindir}/$f
+  ln -s %{_libdir}/clang-analyzer/$f/$f %{buildroot}%{_bindir}/$f
 done
 
-pushd tools/clang/utils
-cp -p ccc-analyzer %{buildroot}%{_libdir}/clang-analyzer/libexec/
-
-for f in scan-build scanview.css sorttable.js; do
-  cp -p $f %{buildroot}%{_libdir}/clang-analyzer/
-done
-popd
+(cd tools/clang/tools && cp -pr scan-{build,view} \
+ %{buildroot}%{_libdir}/clang-analyzer/)
 
-pushd tools/clang/tools/scan-view
-cp -pr * %{buildroot}%{_libdir}/clang-analyzer/
-popd
 
 # Move documentation back to build directory
 # 
@@ -248,17 +244,14 @@ done
 rm -rf tools/clang/docs/{doxygen*,Makefile*,*.graffle,tools}
 
 
-find %{buildroot} -name .dir -print0 | xargs -0r rm -f
+#find %{buildroot} -name .dir -print0 | xargs -0r rm -f
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
 file %{buildroot}/%{_libdir}/llvm/*.so | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
-chrpath -d %{buildroot}/%{_libexecdir}/clang-cc
+#chrpath -d %{buildroot}/%{_libexecdir}/clang-cc
 
 # Get rid of erroneously installed example files.
 rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
-# Remove deprecated tools.
-rm %{buildroot}%{_bindir}/gcc{as,ld}
-
 # FIXME file this bug
 sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
@@ -282,43 +275,38 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt
-%exclude %{_bindir}/llvm-config
+%doc CREDITS.TXT LICENSE.TXT README.txt llvm-testlog.txt
 %{_bindir}/bugpoint
 %{_bindir}/llc
 %{_bindir}/lli
+%exclude %{_bindir}/llvm-config
 %{_bindir}/llvm*
 %{_bindir}/opt
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
+%dir %{_libdir}/llvm
+%{_libdir}/llvm/*.so
 %exclude %{_mandir}/man1/clang.1.*
-%exclude %{_mandir}/man1/FileCheck.1.*
-%doc %{_mandir}/man1/*.1.gz
-
-%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
-%exclude %{_bindir}/llvm-[cg]++
-%exclude %{_bindir}/llvm-gcc
-%exclude %{_mandir}/man1/llvm-[cg]++.*
-%exclude %{_mandir}/man1/llvm-gcc.*
-%endif
-
+%doc %{_mandir}/man1/*.1.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/llvm-config
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%{_libdir}/%{name}
+%{_libdir}/%{name}/*.a
 
 %files -n clang
 %defattr(-,root,root,-)
-%doc clang-docs/* testlog.txt
+%doc clang-docs/* clang-testlog.txt
 %{_bindir}/clang*
-%{_bindir}/FileCheck
-%{_bindir}/FileUpdate
 %{_bindir}/tblgen
 %{_prefix}/lib/clang
-%{_libexecdir}/clang-cc
 %doc %{_mandir}/man1/clang.1.*
-%doc %{_mandir}/man1/FileCheck.1.*
+
+%files -n clang-devel
+%defattr(-,root,root,-)
+%{_includedir}/clang
+%{_includedir}/clang-c
 
 %files -n clang-analyzer
 %defattr(-,root,root,-)
@@ -358,6 +346,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May  2 2010 Michel Salim <salimma at fedoraproject.org> - 2.7-1
+- Update to final 2.7 release
+
+* Sun Mar 28 2010 Michel Salim <salimma at fedoraproject.org> - 2.7-0.1.pre1
+- Update to first 2.7 pre-release
+
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.6.pre2
+- Update to 2.6 pre-release2
+- -devel subpackage now virtually provides -static
+
 * Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.5.pre1
 - Disable var tracking assignments on PPC
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Sep 2009 06:59:47 -0000	1.8
+++ sources	2 May 2010 21:33:15 -0000	1.9
@@ -1,2 +1,2 @@
-d4d2cfbb962eca0c96aa1d794e23a681  llvm-2.6.tar.gz
-80a2a9bbe8fa7c403b2ec7aca8b4108f  clang-2.6.tar.gz
+b83260aa8c13494adf8978b5f238bf1b  clang-2.7.tgz
+ac322661f20e7d6c810b1869f886ad9b  llvm-2.7.tgz


--- llvm-2.5-tclsh_check.patch DELETED ---


--- llvm-2.6-destdir-clang.patch DELETED ---


--- llvm-2.6-destdir.patch DELETED ---

