From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AF4FD1381F3 for ; Thu, 10 Oct 2013 19:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5836CE0B00; Thu, 10 Oct 2013 19:12:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0BF7E0B00 for ; Thu, 10 Oct 2013 19:12:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B81133EE7D for ; Thu, 10 Oct 2013 19:12:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 20946E5308 for ; Thu, 10 Oct 2013 19:12:19 +0000 (UTC) From: "Honza Macháček" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Honza Macháček" Message-ID: <1381432316.9926a5663d9b945cfa2378e491660c9a5535f86c.honza_machacek@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/files/, sci-physics/abinit/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/abinit/ChangeLog sci-physics/abinit/abinit-7.4.2.ebuild sci-physics/abinit/files/7.4.2-cuda_link_stdc++.patch X-VCS-Directories: sci-physics/abinit/files/ sci-physics/abinit/ X-VCS-Committer: honza_machacek X-VCS-Committer-Name: Honza Macháček X-VCS-Revision: 9926a5663d9b945cfa2378e491660c9a5535f86c X-VCS-Branch: master Date: Thu, 10 Oct 2013 19:12:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b2b4e96a-fa84-4a27-aae7-b78a975cea71 X-Archives-Hash: 0babc7732b4a716e26bfe58b0908494d commit: 9926a5663d9b945cfa2378e491660c9a5535f86c Author: Honza Macháček centrum cz> AuthorDate: Thu Oct 10 19:11:56 2013 +0000 Commit: Honza Macháček centrum cz> CommitDate: Thu Oct 10 19:11:56 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9926a566 sci-physics/abinit-7.4.2 patched to link libstdc++ with the C++ CUDA objects. Package-Manager: portage-2.2.7 --- sci-physics/abinit/ChangeLog | 4 ++++ sci-physics/abinit/abinit-7.4.2.ebuild | 3 ++- .../abinit/files/7.4.2-cuda_link_stdc++.patch | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index 3201370..6baa378 100644 --- a/sci-physics/abinit/ChangeLog +++ b/sci-physics/abinit/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Oct 2013; Honza Macháček abinit-7.4.2.ebuild, + +files/7.4.2-cuda_link_stdc++.patch: + Added a patch to link libstdc++ with the C++ CUDA objects. + 03 Oct 2013; Honza Macháček abinit-7.4.2.ebuild: Call python_fix_shebang only conditionally, if USE test (does not work without python-single-r1_pkg_setup, which is don only if USE test or diff --git a/sci-physics/abinit/abinit-7.4.2.ebuild b/sci-physics/abinit/abinit-7.4.2.ebuild index 119f491..02aa0dd 100644 --- a/sci-physics/abinit/abinit-7.4.2.ebuild +++ b/sci-physics/abinit/abinit-7.4.2.ebuild @@ -179,7 +179,8 @@ src_prepare() { "${FILESDIR}"/6.12.1-autoconf.patch \ "${FILESDIR}"/6.12.1-xmalloc.patch \ "${FILESDIR}"/7.4.2-levmar_diag_scaling.patch \ - "${FILESDIR}"/7.4.2-syntax.patch + "${FILESDIR}"/7.4.2-syntax.patch \ + "${FILESDIR}"/7.4.2-cuda_link_stdc++.patch eautoreconf sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure use test && python_fix_shebang "${S}"/tests diff --git a/sci-physics/abinit/files/7.4.2-cuda_link_stdc++.patch b/sci-physics/abinit/files/7.4.2-cuda_link_stdc++.patch new file mode 100644 index 0000000..225d039 --- /dev/null +++ b/sci-physics/abinit/files/7.4.2-cuda_link_stdc++.patch @@ -0,0 +1,21 @@ +diff -Naur abinit-7.4.2.orig/src/98_main/Makefile.am abinit-7.4.2/src/98_main/Makefile.am +--- src/98_main/Makefile.am 2013-09-08 07:27:21.000000000 +0000 ++++ src/98_main/Makefile.am 2013-10-10 12:20:26.678606398 +0000 +@@ -37,7 +37,7 @@ + LIB_12_HIDE_MPI = $(top_builddir)/src/12_hide_mpi/lib12_hide_mpi.a + LIB_14_HIDEWRITE = $(top_builddir)/src/14_hidewrite/lib14_hidewrite.a + if DO_BUILD_15_GPU_TOOLBOX +- LIB_15_GPU_TOOLBOX = $(top_builddir)/src/15_gpu_toolbox/lib15_gpu_toolbox.a ++ LIB_15_GPU_TOOLBOX = $(top_builddir)/src/15_gpu_toolbox/lib15_gpu_toolbox.a -lstdc++ + else + LIB_15_GPU_TOOLBOX = + endif +@@ -59,7 +59,7 @@ + LIB_51_MANAGE_MPI = $(top_builddir)/src/51_manage_mpi/lib51_manage_mpi.a + LIB_52_FFT_MPI_NOABIRULE = $(top_builddir)/src/52_fft_mpi_noabirule/lib52_fft_mpi_noabirule.a + if DO_BUILD_52_MANAGE_CUDA +- LIB_52_MANAGE_CUDA = $(top_builddir)/src/52_manage_cuda/lib52_manage_cuda.a ++ LIB_52_MANAGE_CUDA = $(top_builddir)/src/52_manage_cuda/lib52_manage_cuda.a -lstdc++ + else + LIB_52_MANAGE_CUDA = + endif