packages: llvm/llvm.spec - fix Makefile.config.in patching. - adjust instal...

[pluto]

Author: pluto                        Date: Wed Nov 10 12:48:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix Makefile.config.in patching.
- adjust install/files.
- release 2.

---- Files affected:
packages/llvm:
   llvm.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/llvm/llvm.spec
diff -u packages/llvm/llvm.spec:1.16 packages/llvm/llvm.spec:1.17
--- packages/llvm/llvm.spec:1.16	Wed Nov 10 12:54:59 2010
+++ packages/llvm/llvm.spec	Wed Nov 10 13:48:37 2010
@@ -17,7 +17,7 @@
 Summary(pl.UTF-8):	Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:		llvm
 Version:	2.8
-Release:	1
+Release:	2
 License:	University of Illinois/NCSA Open Source License
 Group:		Development/Languages
 Source0:	http://llvm.org/releases/%{version}/%{name}-%{version}.tgz
@@ -190,6 +190,9 @@
 mv clang-*.* tools/clang
 %patch3 -p1
 
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
+
 grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
 	s,^#!.*bin/env python,#!%{__python},
 	s,^#!.*bin/env perl,#!%{__perl},
@@ -220,10 +223,6 @@
 	--enable-shared \
 	--with-pic
 
-# FIXME file this
-# configure does not properly specify libdir
-sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
-
 %{__make} \
 	OPTIMIZE_OPTION="%{rpmcflags} %{rpmcppflags}"
 
@@ -268,10 +267,10 @@
 done
 
 # Get rid of erroneously installed example files.
-rm -v $RPM_BUILD_ROOT%{_libdir}/%{name}/*LLVMHello.*
+rm -v $RPM_BUILD_ROOT%{_libdir}/*LLVMHello.*
 
 # FIXME file this bug
-sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
+sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}",' \
 	$RPM_BUILD_ROOT%{_bindir}/llvm-config
 
 # remove documentation makefiles:
@@ -280,9 +279,6 @@
 cp -a examples moredocs/examples
 find moredocs/examples -name Makefile | xargs -0r rm -f
 
-# Move shared runtime to standard libdir.
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{LLVM-*.*,clang}.so $RPM_BUILD_ROOT%{_libdir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -316,9 +312,13 @@
 %attr(755,root,root) %{_bindir}/llvm-config
 %{_includedir}/llvm
 %{_includedir}/llvm-c
-%{_libdir}/%{name}
+%{_libdir}/lib*.a
+%attr(755,root,root) %{_libdir}/libBugpointPasses.so
+%attr(755,root,root) %{_libdir}/libEnhancedDisassembly.so
 %exclude %attr(755,root,root) %{_libdir}/libLLVM-*.*.so
+%attr(755,root,root) %{_libdir}/libLTO.so
 %exclude %attr(755,root,root) %{_libdir}/libclang.so
+%attr(755,root,root) %{_libdir}/libprofile_rt.so
 
 %files doc
 %defattr(644,root,root,755)
@@ -397,6 +397,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/11/10 12:48:37  pluto
+- fix Makefile.config.in patching.
+- adjust install/files.
+- release 2.
+
 Revision 1.16  2010/11/10 11:54:59  pluto
 - move tblgen.1 manpage to proper package.
 - move shared runtime libs to proper core packages.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/llvm/llvm.spec?r1=1.16&r2=1.17&f=u