diff options
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/Manifest | 10 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/files/6_5-raise_gcc_supported_version_to_9.patch | 17 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch | 17 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-7.5.18-gcc54.patch (renamed from dev-util/nvidia-cuda-toolkit/files/7.5-raise_gcc_supported_version_to_5_3.patch) | 10 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild | 145 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild | 12 |
6 files changed, 15 insertions, 196 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index f64d159..ab1e50a 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,10 +1,6 @@ -AUX 6_5-raise_gcc_supported_version_to_9.patch 599 SHA256 b9d51ec4d9266812a659bdb01975aac70428cb9987ea515e3a4bde8ff47bb375 SHA512 c58f72a2d50560b4386dc6c59d9cc4db328f6adb50118230a18ded2bb7a106c95e4f1444573d43a8c1a229c9861d487d0758ab764292998a287b992f42b67541 WHIRLPOOL c7801eeed79237627e845a3b63978bde2f6aa2a67e4e4d771f2a82175426ba45e749c28c9b777d97cd9c77315060395089ae1fb476c6c5f2cfc228bd2ac24bdd -AUX 7.5-raise_gcc_supported_version_to_5_3.patch 751 SHA256 1a770416224f7356a612f5a265d39b11dd7319b382a91128066a8c1cddb4099e SHA512 7a016345d1642976ec1e565f80548ce98ab5a970a1c091d2c54382db9f4b7187b0aec23807d36edc6dec4274aa5b4b934eab783cfce906a6f3e2e106f5c1efd4 WHIRLPOOL 28a539aa79f2951c748565c24f79c2219d233843004ce480170339d314ae7dafcbf4d8513db7974c39b9f672a1571e587ffcf7623301d2ba974c35465787b156 -AUX 7_0-raise_gcc_supported_version_to_5_2.patch 724 SHA256 3104972621bec84512573c5e0d30f7444dcf659a851f882840fed5849c9dfe87 SHA512 a00cc905d08cc38028e17413caef520ea4b409fcf46db3ce01628000adff1589f116b8c868f6b84d2fb816bed2d99c5a661bec84b18bd8b7f7540577256f083e WHIRLPOOL 534e9f6ed66fb5b15e09d29b6e4cc5a66686e30e9aacdfc803b71401696c49c60bb929cdd5042974dc1c5f719e68bb0e1a0901c66bb71b8ef72c940f96746132 AUX cuda-config.in 406 SHA256 7271463891ff75dd83f4cb42bb3004d3204243d0e38f9cbd5b4ec4560865496a SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b WHIRLPOOL 4a26ee11d97676827cb01644891fdca495c3373585ddfbb5fab9f988186da384f27482c4be9e27d834036ffa87f7ee19f9ad7da2d8536babe874dda4ff991147 -DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475 -DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247 -EBUILD nvidia-cuda-toolkit-7.0.28-r1.ebuild 3430 SHA256 488cf8a59aaea31f721a64abf673c7b6bcf5404c094d7000737b05f8f1b2eece SHA512 6a81d7b55bbc457b832654caf9dcea11cc7ebb51b069a7a018432b2704c308128a7609a1833478e91549ae62ead6dc8618d2d37568c8ea78b973fee55b78825f WHIRLPOOL f50b474a222b0812d195e1378b819283b82c476c78c3bb2bae48cb1da768e9f5c28ad4bc1dee0dd087f9601a1d6af0b6cd6ec4a05386260f7c013b2766fdd092 -EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3403 SHA256 c5b23398eb9bdc1907cf00a5c1b4bddc64e77162bae3d168042659f71ab5bed7 SHA512 68c4837f1f7547acdfb4ad1c93033391544d2161ce9ce5cc4d44b637db537fba7ceb7fddc68d9015695ac1a7946f916db5eae3da2d42a4b1b0956b65e7e1ea02 WHIRLPOOL 49ab9d2c6365c4669240f0d4209a81d8c1776c8d332e1dd81c502153afc145d5b0e62d6ee4cb5b927fe3bb8c42f0fb12c94a0d89219e90325377289df5325dee +AUX nvidia-cuda-toolkit-7.5.18-gcc54.patch 679 SHA256 7e00d427b0f1c96d4c40ac95667f5af7454b1c155e744ec72cf0e88a8828bdb2 SHA512 082f5273fa57b7d7d5fb67751e9fc27cc1ae0dd0e8c9fd0e8971acac96f2fe892585604a163df1c3e51a8e12d15e697713d47d722a6210c22554dd60f763e472 WHIRLPOOL 1bb99409927f1e0efad338819e612ce9c5688829ed1f0bd820387664e893fd6cdd23556b5bc3990a7828634019a70d88925f5bdab9593e6347e90115e182d34b +DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10 +EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3393 SHA256 6c10e857ecc4d084e19f758af37d2249fb64181638e3898414a7e9a14207c74d SHA512 2d73511bc747978a97ab296a67928cd896c11e70a1d08500d8ea1078f1ac70f7d7ce519b07825c2602ac06fe259aa629e1ab4c093f4467d13a8feb5cae0eec2b WHIRLPOOL ebd2f318809d49ec8fae73f0852d24fe7b861a860f3ca02c6d8af576fcd8a46dc1ea780dd59e878f37999962b4d69ccc76f5a2f41a9d1a726ecadc29d59c5c74 MISC ChangeLog 18149 SHA256 0ef410bb3a15e56df39ad2e2b8c5c504893cd40e7595a7ba42349837390419df SHA512 90d4e13f07afdd976150d912d7efd27bbbee6f6df0b4752271e425c84dcbe94d3b08cdcd4f358e9c8e7ce910923c64cd883e22c1bce4da8023031232da0d9be2 WHIRLPOOL 86bff8047e8bbcf15da0cf1cfcf6d7e93314ad5fb7354c6b4a53ca6da2f3da1ca28bdbf756d499b6139a85199d4334efb213c259cff917525bfc29a5f79bbf2f MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473 diff --git a/dev-util/nvidia-cuda-toolkit/files/6_5-raise_gcc_supported_version_to_9.patch b/dev-util/nvidia-cuda-toolkit/files/6_5-raise_gcc_supported_version_to_9.patch deleted file mode 100644 index 8e50369..0000000 --- a/dev-util/nvidia-cuda-toolkit/files/6_5-raise_gcc_supported_version_to_9.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/include/host_config.h 2014-08-08 19:37:24.000000000 +0200 -+++ b/include/host_config.h 2014-10-30 14:14:15.622996929 +0100 -@@ -77,11 +77,11 @@ - - #if defined(__GNUC__) - --#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 8) -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) - --#error -- unsupported GNU version! gcc 4.9 and up are not supported! -+#error -- unsupported GNU version! gcc 4.10 and up are not supported! - --#endif /* __GNUC__> 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 8) */ -+#endif /* __GNUC__> 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) */ - - #endif /* __GNUC__ */ - diff --git a/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch b/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch deleted file mode 100644 index 2b27365..0000000 --- a/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/include/host_config.h 2015-03-06 09:43:05.000000000 +0100 -+++ b/include/host_config.h 2015-09-03 18:30:08.733054542 +0200 -@@ -100,11 +100,11 @@ - - #if defined(__GNUC__) - --#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) -+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 2) - --#error -- unsupported GNU version! gcc 4.10 and up are not supported! -+#error -- unsupported GNU version! gcc 5.3 and up are not supported! - --#endif /* __GNUC__> 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) */ -+#endif /* __GNUC__> 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 2) */ - - #if defined(__APPLE__) && defined(__MACH__) && !defined(__clang__) - #error -- clang and clang++ are the only supported host compilers on Mac OS X! diff --git a/dev-util/nvidia-cuda-toolkit/files/7.5-raise_gcc_supported_version_to_5_3.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-7.5.18-gcc54.patch index 2b10194..fba0ad2 100644 --- a/dev-util/nvidia-cuda-toolkit/files/7.5-raise_gcc_supported_version_to_5_3.patch +++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-7.5.18-gcc54.patch @@ -1,17 +1,17 @@ ---- a/include/host_config.h 2015-09-16 10:58:02.166237005 +0200 -+++ b/include/host_config.h 2015-09-16 10:58:44.789237836 +0200 +--- a/include/host_config.h ++++ b/include/host_config.h @@ -110,11 +110,11 @@ #if defined(__GNUC__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) -+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3) ++#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 4) -#error -- unsupported GNU version! gcc versions later than 4.9 are not supported! -+#error -- unsupported GNU version! gcc versions later than 5.2 are not supported! ++#error -- unsupported GNU version! gcc versions later than 5.4 are not supported! -#endif /* __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) */ -+#endif /* __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3) */ ++#endif /* __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 4) */ #if defined(__APPLE__) && defined(__MACH__) && !defined(__clang__) #error -- clang and clang++ are the only supported host compilers on Mac OS X! diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild deleted file mode 100644 index 14eb345..0000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit check-reqs cuda unpacker versionator - -MYD=$(get_version_component_range 1)_$(get_version_component_range 2) - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="http://developer.nvidia.com/cuda" -SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run" - -SLOT="0/${PV}" -LICENSE="NVIDIA-CUDA" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" - -DEPEND="" -RDEPEND="${DEPEND} - >=sys-devel/gcc-4.7[cxx] - >=x11-drivers/nvidia-drivers-346.35[uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="1500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - cuda_supported_gcc="4.7 4.8 4.9 5.0 5.1 5.2" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - epatch "${FILESDIR}/${MYD}-raise_gcc_supported_version_to_5_2.patch" -} - -src_install() { - local i j - local remove="doc jre run_files install-linux.pl " - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}"${cudadir} - - # dodoc doc/*txt - if use doc; then - dodoc doc/pdf/* - dohtml -r doc/html/* - fi - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=" bin/cuda-gdb extras/Debugger" - ( use profiler || use eclipse ) || remove+=" libnsight" - remove+=" cuda-installer.pl" - - if use profiler; then - # hack found in install-linux.pl - for j in nvvp nsight; do - cat > bin/${j} <<- EOF - #!${EPREFIX}/bin/sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${j} - done - else - use eclipse || remove+=" libnvvp" - remove+=" extras/CUPTI" - fi - - for i in ${remove}; do - ebegin "Cleaning ${i}..." - if [[ -e ${i} ]]; then - find ${i} -delete || die - eend - else - eend $1 - fi - done - - ln -sf lib lib32 || die - - dodir ${cudadir} - mv * "${ED}"${cudadir} || die - - cat > "${T}"/99cuda <<- EOF - PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b=${a[${#a[@]}-1]} - - # if gcc and if not gcc-version is at least greatesst supported - if [[ $(tc-getCC) == *gcc* ]] && \ - ! version_is_at_least $(gcc-version) ${b}; then - echo - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - echo - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild index 9e85cfd..c1d1910 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit check-reqs cuda unpacker versionator @@ -19,8 +19,8 @@ IUSE="debugger doc eclipse profiler" DEPEND="" RDEPEND="${DEPEND} - >=sys-devel/gcc-4.7[cxx] - >=x11-drivers/nvidia-drivers-352.39[uvm] + >=sys-devel/gcc-5.2[cxx] + >=x11-drivers/nvidia-drivers-355.11 debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] @@ -45,15 +45,17 @@ src_unpack() { } src_prepare() { + epatch "${FILESDIR}"/${PN}-7.5.18-gcc54.patch + local cuda_supported_gcc - cuda_supported_gcc="4.7 4.8 4.9 5.0 5.1 5.2 5.3" + cuda_supported_gcc="4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4" sed \ -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - epatch "${FILESDIR}/${MYD}-raise_gcc_supported_version_to_5_3.patch" + eapply_user } src_install() { |