summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2013-03-09 15:21:24 +0000
committerChristoph Junghans <ottxor@gentoo.org>2013-03-09 15:21:24 +0000
commitb737f957c2f794849a0878b5e267f596bdd8be99 (patch)
tree567f573ecc6e4b3c42d70afb594519386c44b1ff /sci-chemistry
parentVersion bump (diff)
downloadhistorical-b737f957c2f794849a0878b5e267f596bdd8be99.tar.gz
historical-b737f957c2f794849a0878b5e267f596bdd8be99.tar.bz2
historical-b737f957c2f794849a0878b5e267f596bdd8be99.zip
fix cuda build (bug #460518)
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/gromacs/ChangeLog5
-rw-r--r--sci-chemistry/gromacs/Manifest18
-rw-r--r--sci-chemistry/gromacs/gromacs-4.6.1.ebuild9
3 files changed, 18 insertions, 14 deletions
diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index aeaf99af3f11..8498acf0155b 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/gromacs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.121 2013/03/06 02:02:01 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.122 2013/03/09 15:18:52 ottxor Exp $
+
+ 09 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gromacs-4.6.1.ebuild:
+ fix cuda build (bug #460518)
*gromacs-4.6.1 (06 Mar 2013)
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index a1c0956be3e2..7727d48e79f4 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -13,17 +13,17 @@ DIST gromacs-manual-4.5.4.pdf 2463242 SHA256 dc14504a7072b61e7aa576c48f04df03356
DIST gromacs-manual-4.6.1.pdf 5525657 SHA256 a00bb94f5bccb9844d8359c6584fc231f76a597efbb3165387f0adc20e6cc876 SHA512 de255f79f0e395adcb454b9efbc7c7331edf2889f861f1d48ede88134e49dc4d17cec923edb1438de2988aff7184cc797f1502cfb33d536bf8fc1dd73ed63ca9 WHIRLPOOL f6cc8dcec5edb3d4be69ddcc81760b41b86b422bbf103d79a3546e20374718c8bb9416d5b7cd8e9e05a4b37d9e60ff9e4d0fee4908feaf493b9c5a50e9eab399
DIST regressiontests-4.6.1.tar.gz 43569240 SHA256 4e89168519588e71b4618627692d5e498c03e7ac513cfabe6cd37f64492e0db9 SHA512 c75da15a393a6a6efa8a4e54f45fbf178ca9c0c3a5484aaf20d4c425b36b4af732269bb2582365d0360bf5843e66284281cdf842c6616e7d5c7596edf8e8755c WHIRLPOOL 84c1443f4c72cfda0f000b268b863b24c67c6572929aeaf895e5ecaeef0da231a3469c4bc070f8e3178874f8e070d93c64330e212b513d673718b9c2fc0a9ccf
EBUILD gromacs-4.5.5-r1.ebuild 7808 SHA256 ffedeea7d72e555a7ee13232b252c536d917ea9f428558386e72ccc010779b01 SHA512 1c21a6b55611c7aff88bf67a5519e5926cb9277bba44db36eebdf4e22f9fcc733a157ae2e2643123f1e38f998fd8d1524a5440b20de5c041d832567e12976497 WHIRLPOOL 7a2664e943bbd2eac9e095a37946794a32f843ec90dcc3c05209a77c454a17c61ea19ed5105bd81ccc1014f500ac434f4a2e73802decbbed0041a298f1c7dc54
-EBUILD gromacs-4.6.1.ebuild 8812 SHA256 f5caee01d884d2745b35c14155a8ea0dbe013993be7122d177129d5c1575e21a SHA512 950778bcd008438acfc2f523c95f7e30cf49cd865baf17a645b2a7402783f149a585b92951feb41d556119f3e24353046b1303bc6e11bd2f69c18ebb134dca60 WHIRLPOOL b12bd83a69acdbacae7cbf6ebdeafab90f4a5de738256b0c878f7bf8c9174b4c3dbfe41ebdea267d1c3d4935ba2817310ff066f186fe3b477f0fd6a156bcabed
-MISC ChangeLog 20230 SHA256 6ab253eb62b3def5602c45bdc3e17dcf731c7f9f53df7b61d1884e669152958f SHA512 7ed59fbff63fbcd2d0b1dea8e6750fcada7a34cf3e6ca750fe7d7c6bab0faeaa92b540a6febb9b46f458113a88196051f4bed4d1c86e706e0598c6519d7c16ae WHIRLPOOL 794289a3e32c56b327cb1cde245543d316d02cdf4c0a5e090f2a4295fa053d4cba12f88e5c27c46c20baac6e97b5327fd8583e72c61eb54710ede848020edeb3
+EBUILD gromacs-4.6.1.ebuild 8855 SHA256 966a7e53283a9efd4d3daa855935c3c12884c0f0e6f429a80e37160074ed251e SHA512 f4d0ddcf0d63ea4ff6234108b3b88ce1708dfc9dfb98e25ad76ceca4a8b8cc0d2ecf9718df92ad93abbce2c2cb3c2790d6dfe3a92b900ece1a9d6fb6122a28ff WHIRLPOOL 459955fdc2296ee82203e47a6e839dc2054b7283e4e70232d67c9dc80e1355a4f05a56c8009b74caf53f0ee7eb3a0dbe0bc98e4f08289d5c8a14de1b375681ab
+MISC ChangeLog 20338 SHA256 96c082d5be9a8808dfcedbb05d240cfec7831092c4306d13321ba23be37e7c97 SHA512 44a6550a426fc9c590759bef4894a4ee316215b299f8e8281e7504d19753904ade802a24e63a65fef5ab52d9d345cc2e19d42b1a3c913008d757cd3d325c10af WHIRLPOOL 0b671dfa1fa324a64c8dc4278167213ddf9b3f0ac7a4f8b3e3e9fd55068d89c793f028f95195583498ee25c86777a9dacdcb1d2df2cc1db95b894ad84136a31e
MISC metadata.xml 1111 SHA256 9ac7c2d8dc6b9e6523565bb9d2ba681cd784ce508bbc948f108c54ac554b3d15 SHA512 43365c5266138f79136937fe38d00161b0ac808b2fef1af6bf260ef3043b2d9504e35b83f4ae4564f212b7393e65743e73b123b7c15e989b880a5b266005225e WHIRLPOOL ba60f8ae78266b140b89eab018235475401ae8a9dd7b9333b3fee720081be047db6f5f3f81c63b5289e8a50089ae480883dbc18e1f70bdda4751d51df70f01b9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJRNqOaAAoJEOeBhlrCAAWGBcMIAKBzyorQodb0ATkLe2kIVoNs
-3jF0umdQM9FUjj3RWiAX0NuziO4v/rbWmGcKPEEQLIpVKnTeUaUZt18zthY7Ch2J
-IU8GDbFBk1dMi9+4wTgF9K5nXQKbMair7FkSzJCtcVs9WdYUCiTel/KKiUgCJH0M
-TXkzR83UVi9XMjK/i9KxMS19o4ijee+Z2tHhpp5bgvpipRc/Qw9SOysGY1xZHafO
-h2e51zl3fj+m0YxqhWyoXEnC/HRg5iV1LssQrKB31GRBZxLe2L3Icp72eN5o82JK
-4g/wXsUh/UZwtF//mlbyWDb0n0p4/8nMArDs9oPAF0nTxt+pUR/p8INbT8Se1r8=
-=do/v
+iQEcBAEBCAAGBQJRO1NvAAoJEOeBhlrCAAWG5SkH/RxW/m12kceijyGh3Gq52osW
+9+BCTFWCMeoJFef5mEPLSJ93bkkp5NwzScM+exDWFIkmez2PNTvL+AP1jXcdQYzw
+9hcL6fSQNGCZMPMfK1EAZinVrbRhHHvnwxYBQ8YN5mKyOMCoWBoaMifLbd242ocY
+hutS/dt7TY22zErUNxpzDbKy1QI2ByaWXpAdLfH6GTeDhUwJ3vvEI2nYx7cvKFfr
+t5qmZp9XE/UvtaIDdh8tMlJZNJO2bXzTqmibkXAyEXoL61QZk63ngEUK13fX47FM
+W+r9XIUsvFNNqzslPPEQjmCkLjCjCZ4JbM9jYtfQ4zKfVmRkhXn/O7i9/kY9X/s=
+=X5VQ
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gromacs/gromacs-4.6.1.ebuild b/sci-chemistry/gromacs/gromacs-4.6.1.ebuild
index 226082edf7c4..fdf8eb5287c8 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.1.ebuild,v 1.1 2013/03/06 02:02:01 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.1.ebuild,v 1.2 2013/03/09 15:18:52 ottxor Exp $
EAPI=5
@@ -180,10 +180,11 @@ src_configure() {
[[ ${x} = "double" ]] && suffix="_d"
local p
[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
- local cuda=$(cmake-utils_use cuda GMX_GPU)
- [[ ${x} = "double" ]] && use cuda && cuda="-DGMX_GPU=OFF"
+ local cuda=( "-DGMX_GPU=OFF" )
+ [[ ${x} = "single" ]] && use cuda && \
+ cuda=( -DGMX_GPU=ON -DCUDA_HOST_COMPILER_OPTIONS="${NVCCFLAGS}" )
mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
- $(cmake-utils_use threads GMX_THREAD_MPI) ${cuda} -DGMX_OPENMM=OFF
+ $(cmake-utils_use threads GMX_THREAD_MPI) "${cuda[@]}" -DGMX_OPENMM=OFF
"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" )
BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure