* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass
@ 2013-01-11 8:31 Justin Lecher (jlec)
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-11 8:31 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/11 08:31:49
Modified: ChangeLog
Added: cuda.eclass
Log:
Add new eclass
Revision Changes Path
1.608 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.608&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.608&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.607&r2=1.608
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -r1.607 -r1.608
--- ChangeLog 11 Jan 2013 01:06:37 -0000 1.607
+++ ChangeLog 11 Jan 2013 08:31:49 -0000 1.608
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.607 2013/01/11 01:06:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.608 2013/01/11 08:31:49 jlec Exp $
+
+ 11 Jan 2013; Justin Lecher <jlec@gentoo.org> +cuda.eclass:
+ Add new eclass
11 Jan 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
Close the lock file explicitly instead of relying on the subshell created by
1.1 eclass/cuda.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.1&content-type=text/plain
Index: cuda.eclass
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.1 2013/01/11 08:31:49 jlec Exp $
inherit toolchain-funcs versionator
# @ECLASS: cuda.eclass
# @MAINTAINER:
# Justin Lecher <jlec@gentoo.org>
# @BLURB: Common functions for cuda packages
# @DESCRIPTION:
# This eclass contains functions to be used with cuda package. Currently it is
# setting and/or sanitizing NVCCFLAGS, the compiler flags for nvcc. This is
# automatically done and exported in src_prepare() or manually by calling
# cuda_sanatize.
# @EXAMPLE:
# inherit cuda
# @ECLASS-VARIABLE: NVCCFLAGS
# @DESCRIPTION:
# nvcc compiler flags (see nvcc --help), which should be used like
# CFLAGS for c compiler
: ${NVCCFLAGS:=-O2}
# @ECLASS-VARIABLE: CUDA_VERBOSE
# @DESCRIPTION:
# Being verbose during compilation to see underlying commands
: ${CUDA_VERBOSE:=true}
# @FUNCTION: cuda_gccdir
# @USAGE: [-f]
# @RETURN: gcc bindir compatible with current cuda, optionally (-f) prefixed with "--compiler-bindir="
# @DESCRIPTION:
# Helper for determination of the latest gcc bindir supported by
# then current nvidia cuda toolkit.
#
# Example:
# @CODE
# cuda_gccdir -f
# -> --compiler-bindir="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
# @CODE
cuda_gccdir() {
local gcc_bindir ver args="" flag ret
# Currently we only support the gnu compiler suite
if [[ $(tc-getCXX) != *g++* ]]; then
ewarn "Currently we only support the gnu compiler suite"
return 2
fi
while [ "$1" ]; do
case $1 in
-f)
flag="--compiler-bindir="
;;
*)
;;
esac
shift
done
if ! args=$(cuda-config -s); then
eerror "Could not execute cuda-config"
eerror "Make sure >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 is installed"
die "cuda-config not found"
else
args=$(version_sort ${args})
if [[ -z ${args} ]]; then
die "Could not determine supported gcc versions from cuda-config"
fi
fi
for ver in ${args}; do
has_version sys-devel/gcc:${ver} && \
gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}* | tail -n 1)"
done
if [[ -n ${gcc_bindir} ]]; then
if [[ -n ${flag} ]]; then
ret="${flag}\\\"${gcc_bindir}\\\""
else
ret="${gcc_bindir}"
fi
echo ${ret}
return 0
else
eerror "Only gcc version(s) ${args} are supported,"
eerror "of which none is installed"
die "Only gcc version(s) ${args} are supported"
return 1
fi
}
# @FUNCTION: cuda_sanitize
# @DESCRIPTION:
# Correct NVCCFLAGS by adding the necessary reference to gcc bindir and
# passing CXXFLAGS to underlying compiler without disturbing nvcc.
cuda_sanitize() {
# Be verbose if wanted
[[ "${CUDA_VERBOSE}" == true ]] && NVCCFLAGS+=" -v"
# Tell nvcc where to find a compatible compiler
NVCCFLAGS+=" $(cuda_gccdir -f)"
# Tell nvcc which flags should be used for underlying C compiler
NVCCFLAGS+=" --compiler-options=\"${CXXFLAGS}\""
export NVCCFLAGS
}
# @FUNCTION: cuda_pkg_setup
# @DESCRIPTION:
# Call cuda_src_prepare for EAPIs not supporting src_prepare
cuda_pkg_setup() {
cuda_src_prepare
}
# @FUNCTION: cuda_src_prepare
# @DESCRIPTION:
# Sanitise and export NVCCFLAGS by default
cuda_src_prepare() {
cuda_sanitize
}
case "${EAPI:-0}" in
0|1)
EXPORT_FUNCTIONS pkg_setup ;;
2|3|4|5)
EXPORT_FUNCTIONS src_prepare ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass
@ 2014-09-17 10:21 Justin Lecher (jlec)
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-09-17 10:21 UTC (permalink / raw
To: gentoo-commits
jlec 14/09/17 10:21:37
Modified: ChangeLog cuda.eclass
Log:
nvcc always needs tp know the compiler location
Revision Changes Path
1.1372 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1372&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1372&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1371&r2=1.1372
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1371
retrieving revision 1.1372
diff -u -r1.1371 -r1.1372
--- ChangeLog 16 Sep 2014 17:49:57 -0000 1.1371
+++ ChangeLog 17 Sep 2014 10:21:37 -0000 1.1372
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1371 2014/09/16 17:49:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1372 2014/09/17 10:21:37 jlec Exp $
+
+ 17 Sep 2014; Justin Lecher <jlec@gentoo.org> cuda.eclass:
+ nvcc always needs tp know the compiler location
16 Sep 2014; Johannes Huber <johu@gentoo.org> kde4-base.eclass:
Add kde-workspace 4.11.12 SRC_URI, remove obsolete.
1.4 eclass/cuda.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?r1=1.3&r2=1.4
Index: cuda.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cuda.eclass 11 Aug 2013 16:20:23 -0000 1.3
+++ cuda.eclass 17 Sep 2014 10:21:37 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.3 2013/08/11 16:20:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.4 2014/09/17 10:21:37 jlec Exp $
inherit flag-o-matic toolchain-funcs versionator
@@ -101,9 +101,7 @@
[[ "${CUDA_VERBOSE}" == true ]] && NVCCFLAGS+=" -v"
# Tell nvcc where to find a compatible compiler
- if has_version \<=dev-util/nvidia-cuda-toolkit-5.5; then
- NVCCFLAGS+=" $(cuda_gccdir -f)"
- fi
+ NVCCFLAGS+=" $(cuda_gccdir -f)"
# Tell nvcc which flags should be used for underlying C compiler
NVCCFLAGS+=" --compiler-options=\"${CXXFLAGS}\" --linker-options=\"${rawldflags// /,}\""
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass
@ 2014-11-18 19:44 Justin Lecher (jlec)
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-11-18 19:44 UTC (permalink / raw
To: gentoo-commits
jlec 14/11/18 19:44:02
Modified: ChangeLog cuda.eclass
Log:
Fix gcc detection when using multislot, #529710
Revision Changes Path
1.1427 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1427&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1427&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1426&r2=1.1427
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1426
retrieving revision 1.1427
diff -u -r1.1426 -r1.1427
--- ChangeLog 17 Nov 2014 23:34:19 -0000 1.1426
+++ ChangeLog 18 Nov 2014 19:44:02 -0000 1.1427
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1426 2014/11/17 23:34:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1427 2014/11/18 19:44:02 jlec Exp $
+
+ 18 Nov 2014; Justin Lecher <jlec@gentoo.org> cuda.eclass:
+ Fix gcc detection when using multislot, #529710
17 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Make calling fixlocalpod trigger a real warning
1.5 eclass/cuda.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?r1=1.4&r2=1.5
Index: cuda.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cuda.eclass 17 Sep 2014 10:21:37 -0000 1.4
+++ cuda.eclass 18 Nov 2014 19:44:02 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.4 2014/09/17 10:21:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.5 2014/11/18 19:44:02 jlec Exp $
inherit flag-o-matic toolchain-funcs versionator
@@ -71,7 +71,7 @@
fi
for ver in ${args}; do
- has_version sys-devel/gcc:${ver} && \
+ has_version =sys-devel/gcc-${ver}* && \
gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}* | tail -n 1)"
done
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass
@ 2014-11-18 19:54 Justin Lecher (jlec)
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-11-18 19:54 UTC (permalink / raw
To: gentoo-commits
jlec 14/11/18 19:54:06
Modified: ChangeLog cuda.eclass
Log:
Add missing quotes, thanks mgorny for heads up
Revision Changes Path
1.1428 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1428&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1428&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1427&r2=1.1428
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1427
retrieving revision 1.1428
diff -u -r1.1427 -r1.1428
--- ChangeLog 18 Nov 2014 19:44:02 -0000 1.1427
+++ ChangeLog 18 Nov 2014 19:54:06 -0000 1.1428
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1427 2014/11/18 19:44:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1428 2014/11/18 19:54:06 jlec Exp $
+
+ 18 Nov 2014; Justin Lecher <jlec@gentoo.org> cuda.eclass:
+ Add missing quotes, thanks mgorny for heads up
18 Nov 2014; Justin Lecher <jlec@gentoo.org> cuda.eclass:
Fix gcc detection when using multislot, #529710
1.6 eclass/cuda.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?r1=1.5&r2=1.6
Index: cuda.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cuda.eclass 18 Nov 2014 19:44:02 -0000 1.5
+++ cuda.eclass 18 Nov 2014 19:54:06 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.5 2014/11/18 19:44:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.6 2014/11/18 19:54:06 jlec Exp $
inherit flag-o-matic toolchain-funcs versionator
@@ -71,7 +71,7 @@
fi
for ver in ${args}; do
- has_version =sys-devel/gcc-${ver}* && \
+ has_version "=sys-devel/gcc-${ver}*" && \
gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}* | tail -n 1)"
done
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass
@ 2015-05-25 10:07 Justin Lecher (jlec)
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2015-05-25 10:07 UTC (permalink / raw
To: gentoo-commits
jlec 15/05/25 10:07:33
Modified: ChangeLog cuda.eclass
Log:
Loose quoting, #550060
Revision Changes Path
1.1622 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1622&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1622&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1621&r2=1.1622
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1621
retrieving revision 1.1622
diff -u -r1.1621 -r1.1622
--- ChangeLog 24 May 2015 22:44:37 -0000 1.1621
+++ ChangeLog 25 May 2015 10:07:33 -0000 1.1622
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1621 2015/05/24 22:44:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1622 2015/05/25 10:07:33 jlec Exp $
+
+ 25 May 2015; Justin Lecher <jlec@gentoo.org> cuda.eclass:
+ Loose quoting, #550060
24 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
The depend-java-query wrapper is raising readonly variable warnings for USE
1.7 eclass/cuda.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cuda.eclass?r1=1.6&r2=1.7
Index: cuda.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cuda.eclass 18 Nov 2014 19:54:06 -0000 1.6
+++ cuda.eclass 25 May 2015 10:07:33 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.6 2014/11/18 19:54:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.7 2015/05/25 10:07:33 jlec Exp $
inherit flag-o-matic toolchain-funcs versionator
@@ -77,7 +77,7 @@
if [[ -n ${gcc_bindir} ]]; then
if [[ -n ${flag} ]]; then
- ret="${flag}\\\"${gcc_bindir}\\\""
+ ret="${flag}\"${gcc_bindir}\""
else
ret="${gcc_bindir}"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-25 10:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-17 10:21 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cuda.eclass Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2015-05-25 10:07 Justin Lecher (jlec)
2014-11-18 19:54 Justin Lecher (jlec)
2014-11-18 19:44 Justin Lecher (jlec)
2013-01-11 8:31 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox