packages: cudatoolkit/cudatoolkit.spec - rel 2 - workaround for nvcc.profil...

[baggins]

Author: baggins                      Date: Tue Nov 16 18:41:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- workaround for nvcc.profile stupidity

---- Files affected:
packages/cudatoolkit:
   cudatoolkit.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/cudatoolkit/cudatoolkit.spec
diff -u packages/cudatoolkit/cudatoolkit.spec:1.6 packages/cudatoolkit/cudatoolkit.spec:1.7
--- packages/cudatoolkit/cudatoolkit.spec:1.6	Wed Oct  6 12:40:44 2010
+++ packages/cudatoolkit/cudatoolkit.spec	Tue Nov 16 19:41:27 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Zestaw narzędzi NVIDIA CUDA
 Name:		cudatoolkit
 Version:	3.1
-Release:	1
+Release:	2
 License:	nVidia Binary
 Group:		Applications
 Source0:	http://developer.download.nvidia.com/compute/cuda/3_1/toolkit/%{name}_%{version}_linux_32_fedora12.run
@@ -65,7 +65,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/cuda/prof/{doc,bin}} \
-	$RPM_BUILD_ROOT{%{_mandir}/man{1,3},%{_includedir}/cuda}
+	$RPM_BUILD_ROOT{%{_mandir}/man{1,3},%{_includedir}/cuda} \
+	$RPM_BUILD_ROOT%{_sysconfdir}
 
 install pkg/bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -a pkg/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
@@ -75,6 +76,24 @@
 
 cp -a pkg/open64 $RPM_BUILD_ROOT%{_libdir}/cuda
 
+mv $RPM_BUILD_ROOT%{_bindir}/nvcc{,.bin}
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/nvcc.conf
+INCLUDES="-I/usr/include/cuda"
+LIBRARIES="-lcudart"
+
+CUDAFE_FLAGS=
+OPENCC_FLAGS=
+PTXAS_FLAGS=
+EOF
+
+cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/nvcc
+#!/bin/sh
+
+. %{_sysconfdir}/nvcc.conf
+
+exec %{_bindir}/nvcc.bin "\$@"
+EOF
+
 %if %{with prof}
 cp -a pkg/computeprof/doc/computeprof.{html,q*} $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc
 cp -a pkg/computeprof/doc/help.png $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc
@@ -95,6 +114,7 @@
 %files
 %defattr(644,root,root,755)
 %doc pkg/doc/* pkg/bin/nvcc.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nvcc.conf
 %attr(755,root,root) %{_bindir}/bin2c
 %attr(755,root,root) %{_bindir}/cuda-gdb
 %attr(755,root,root) %{_bindir}/cuda-memcheck
@@ -102,6 +122,7 @@
 %attr(755,root,root) %{_bindir}/fatbin
 %attr(755,root,root) %{_bindir}/filehash
 %attr(755,root,root) %{_bindir}/nvcc
+%attr(755,root,root) %{_bindir}/nvcc.bin
 %attr(755,root,root) %{_bindir}/nvopencc
 %attr(755,root,root) %{_bindir}/ptxas
 %{_includedir}/cuda
@@ -134,6 +155,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/11/16 18:41:27  baggins
+- rel 2
+- workaround for nvcc.profile stupidity
+
 Revision 1.6  2010/10/06 10:40:44  baggins
 - qt4assistant required only for profiler
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cudatoolkit/cudatoolkit.spec?r1=1.6&r2=1.7&f=u