Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (1cb18c44181a540eb1abf4f9499d9d0b6b19155f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (1cb18c44181a540eb1abf4f9499d9d0b6b19155f)
  • Date: Wed, 11 Aug 2010 15:18:07 -0500

GIT changes to master z-rejected grimoire by Remko van der Vossen
<wich AT sourcemage.org>:

z-devel/cuda-toolkit/CONFIGURE | 8 +++++++-
z-devel/cuda-toolkit/DETAILS | 12 +++++++++---
z-devel/cuda-toolkit/HISTORY | 3 +++
z-devel/cuda-toolkit/INSTALL | 18 +++++++++++-------
4 files changed, 30 insertions(+), 11 deletions(-)

New commits:
commit 1cb18c44181a540eb1abf4f9499d9d0b6b19155f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

cuda-toolkit: version 3.1

diff --git a/z-devel/cuda-toolkit/CONFIGURE b/z-devel/cuda-toolkit/CONFIGURE
index cdecbf8..3fb7322 100755
--- a/z-devel/cuda-toolkit/CONFIGURE
+++ b/z-devel/cuda-toolkit/CONFIGURE
@@ -1 +1,7 @@
-config_query CUDA_PROF "Install the CUDA profiler? (requires QT4 and various
X libs a.o.)" y
+if [[ $CUDA_PROF ]]; then
+ COMPUTE_PROF=$CUDA_PROF
+ persistent_remove CUDA_PROF
+ persistent_add COMPUTE_PROF
+ persistent_save
+fi &&
+config_query COMPUTE_PROF "Install the CUDA profiler computeprof? (requires
QT4 and various X libs a.o.)" y
diff --git a/z-devel/cuda-toolkit/DETAILS b/z-devel/cuda-toolkit/DETAILS
index 36f6736..0c1c303 100755
--- a/z-devel/cuda-toolkit/DETAILS
+++ b/z-devel/cuda-toolkit/DETAILS
@@ -1,9 +1,15 @@
SPELL=cuda-toolkit
- VERSION=3.0
- SOURCE=cudatoolkit_${VERSION}_linux_64_suse11.1.run
+ VERSION=3.1
+ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ PLATFORM=64
+ else
+ PLATFORM=32
+ fi
+ DISTVERSION=suse11.2
+ SOURCE=cudatoolkit_${VERSION}_linux_${PLATFORM}_${DISTVERSION}.run

SOURCE_URL[0]=http://developer.download.nvidia.com/compute/cuda/${VERSION/./_}/toolkit/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:cc70420d070966623190a42279351949b9e585b29c843223dec4b5f70dccb9ef008d52a7064398ba83ddf1cbdb7cf8538c3a7986a84b1dda0465129c1707001a
+
SOURCE_HASH=sha512:902acff4459de5a5df8e2edee515a76ea16fc1bc89610b83dcc160bdb86eb57dab8bb742f51bb342e2066b86503c788e09d040f56579726938478300d3d42631
WEB_SITE=http://developer.nvidia.com/object/gpucomputing.html
ENTERED=20100410
REJECT="Non-Free Software license"
diff --git a/z-devel/cuda-toolkit/HISTORY b/z-devel/cuda-toolkit/HISTORY
index faed299..ed0b7c3 100644
--- a/z-devel/cuda-toolkit/HISTORY
+++ b/z-devel/cuda-toolkit/HISTORY
@@ -1,2 +1,5 @@
+2010-08-11 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, CONFIGURE, INSTALL: version 3.1, support for 32 bit version
+
2010-04-10 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS, DEPENDS, CONFIGURE, BUILD, PRE_BUILD, INSTALL: spell
created
diff --git a/z-devel/cuda-toolkit/INSTALL b/z-devel/cuda-toolkit/INSTALL
index 3c28839..2625202 100755
--- a/z-devel/cuda-toolkit/INSTALL
+++ b/z-devel/cuda-toolkit/INSTALL
@@ -1,5 +1,3 @@
-pwd
-
function cuda_install {
local mode=$1
shift
@@ -21,8 +19,14 @@ for include in include/*.h include/CL/*.h include/crt/*.h;
do
cuda_install 644 "$include" "$INSTALL_ROOT/usr/$include"
done &&

-for library in lib64/lib*.so.*.*; do
- lib_name=${library#lib64/}
+if [[ "$PLATFORM" == 64 ]]; then
+ lib_dir=lib64
+else
+ lib_dir=lib
+fi
+
+for library in $lib_dir/lib*.so.*.*; do
+ lib_name=${library#$lib_dir/}
cuda_install 755 "$library" "$INSTALL_ROOT/usr/lib/$lib_name"
ln -s "$lib_name" "$INSTALL_ROOT/usr/lib/${lib_name%.*.*}"
ln -s "${lib_name%.*.*}" "$INSTALL_ROOT/usr/lib/${lib_name%.*.*.*}"
@@ -36,8 +40,8 @@ for manpage in man/man*/*; do
cuda_install 644 "$manpage" "$INSTALL_ROOT/usr/share/$manpage"
done

-if [[ $CUDA_PROF == y ]]; then
- for binary in cudaprof/bin/cudaprof cudaprof/bin/assistant; do
- cuda_install 755 "$binary" "$INSTALL_ROOT/usr/${binary#cudaprof/}"
+if [[ $COMPUTE_PROF == y ]]; then
+ for binary in computeprof/bin/computeprof computeprof/bin/assistant; do
+ cuda_install 755 "$binary" "$INSTALL_ROOT/usr/${binary#computeprof/}"
done
fi



  • [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (1cb18c44181a540eb1abf4f9499d9d0b6b19155f), Remko van der Vossen, 08/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page