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 E9E65138010 for ; Sat, 1 Sep 2012 09:36:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFED6E0587; Sat, 1 Sep 2012 09:36:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 80873E0587 for ; Sat, 1 Sep 2012 09:36:45 +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 89F1533D800 for ; Sat, 1 Sep 2012 09:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7E08AE543C for ; Sat, 1 Sep 2012 09:36:42 +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: <1346491963.e4450bb769287be345b4ab831aee1102f537286e.honza_machacek@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/, sci-libs/bigdft/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/bigdft/ChangeLog sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch X-VCS-Directories: sci-libs/bigdft/ sci-libs/bigdft/files/ X-VCS-Committer: honza_machacek X-VCS-Committer-Name: Honza Macháček X-VCS-Revision: e4450bb769287be345b4ab831aee1102f537286e X-VCS-Branch: master Date: Sat, 1 Sep 2012 09:36:42 +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: 6b09b160-7d55-45c1-b641-2297b5a7bee2 X-Archives-Hash: 3e3b9d8cf2aa8bfcaf5263ce2ae8eca3 commit: e4450bb769287be345b4ab831aee1102f537286e Author: Honza Macháček centrum cz> AuthorDate: Sat Sep 1 09:32:43 2012 +0000 Commit: Honza Macháček centrum cz> CommitDate: Sat Sep 1 09:32:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4450bb7 Patches for sci-libs/bigdft to install GPU support corrected not to break linking against the compiled libraries --- sci-libs/bigdft/ChangeLog | 11 ++++++++++ ....6_pre1-r3.ebuild => bigdft-1.6_pre1-r4.ebuild} | 4 +- ...ibs.patch => bigdft-1.6-tuto.1-GPUlibs-1.patch} | 21 -------------------- ...c.patch => bigdft-1.6-tuto.1-bigdft.pc-1.patch} | 8 +++++- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog index dad9867..1f24f09 100644 --- a/sci-libs/bigdft/ChangeLog +++ b/sci-libs/bigdft/ChangeLog @@ -4,6 +4,17 @@ <<<<<<< HEAD +*bigdft-1.6_pre1-r4 (01 Sep 2012) + + 01 Sep 2012; Honza Macháček + -bigdft-1.6_pre1-r3.ebuild, +bigdft-1.6_pre1-r4.ebuild, + -files/bigdft-1.6-tuto.1-GPUlibs.patch, + +files/bigdft-1.6-tuto.1-GPUlibs-1.patch, + -files/bigdft-1.6-tuto.1-bigdft.pc.patch, + +files/bigdft-1.6-tuto.1-bigdft.pc-1.patch: + Patches to install GPU support corrected not to break linking against the + compiled libraries + 10 Jul 2012; Honza Macháček files/bigdft-1.6-tuto.1-GPUlibs.patch: bigdft-1.6-tuto.1-GPUlibs.patch updated not to forget the pkg-config file diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild similarity index 97% rename from sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild rename to sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild index a2cef02..95bbebf 100644 --- a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild +++ b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild @@ -64,9 +64,9 @@ pkg_setup() { src_prepare() { epatch \ "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ - "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch \ + "${FILESDIR}"/"${REAL_P}"-bigdft.pc-1.patch \ "${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \ - "${FILESDIR}"/"${REAL_P}"-GPUlibs.patch + "${FILESDIR}"/"${REAL_P}"-GPUlibs-1.patch sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die eautoreconf diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch similarity index 62% rename from sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch rename to sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch index 5079665..386e39d 100644 --- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch +++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch @@ -1,24 +1,3 @@ -diff -Naur orig/bigdft-1.6-tuto.1.orig/configure.ac patched/bigdft-1.6-tuto.1/configure.ac ---- bigdft-1.6-tuto.1.orig/configure.ac 2012-07-10 08:50:27.000000000 +0000 -+++ bigdft-1.6-tuto.1/configure.ac 2012-07-10 09:03:46.303491671 +0000 -@@ -295,7 +295,7 @@ if test x"$ac_use_cuda_gpu" = "xyes" ; t - fi - fi - AC_SUBST(NVCC_FLAGS) -- LIBCUDA_LIBS="-L$ac_cuda_lib_path -lcudart -lcublas" -+ LIBCUDA_LIBS="-L$ac_cuda_lib_path -lGPU -lcudart -lcublas" - fi - - dnl Use the OpenCL support -@@ -332,7 +332,7 @@ if test x"$ac_use_ocl" = "xyes" ; then - ac_use_ocl="no" - else - dnl LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm -lrt -lstdc++" -- LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm" -+ LIBOCL_LIBS="-L$ac_ocl_path/lib -lOCL -lOpenCL -lm" - fi - LIBS=$LIBS_OLD - fi diff -Naur orig/bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am patched/bigdft-1.6-tuto.1/src/CUDA/Makefile.am --- bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am 2011-09-27 12:43:06.000000000 +0000 +++ bigdft-1.6-tuto.1/src/CUDA/Makefile.am 2012-07-04 12:08:27.000000000 +0000 diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch similarity index 96% rename from sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch rename to sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch index 3ddde70..7c3380a 100644 --- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch +++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch @@ -158,7 +158,11 @@ diff -Naur bigdft-1.6-tuto_orig/Makefile.in bigdft-1.6-tuto/Makefile.in diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in --- bigdft.pc.in 1970-01-01 00:00:00.000000000 +0000 +++ bigdft.pc.in 2012-02-01 09:43:59.000000000 +0000 -@@ -0,0 +1,11 @@ +@@ -0,0 +1,15 @@ ++@USE_CUDA_GPU_FALSE@libs_cuda= ++@USE_CUDA_GPU_TRUE@libs_cuda=$(top_builddir)/src/CUDA/libGPU.a ++@USE_OCL_FALSE@libs_ocl= ++@USE_OCL_TRUE@libs_ocl=$(top_builddir)/src/OpenCL/libOCL.a -lstdc++ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ @@ -168,7 +172,7 @@ diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in +Description: Library for DFT calculation over wavelets. +Requires: +Version: @VERSION@ -+Libs: -L${libdir} -lbigdft -lpoissonsolver @LIBS@ @FCLIBS@ ++Libs: -L${libdir} -lbigdft -lpoissonsolver ${libs_cuda} ${libs_ocl} @LIBS@ @FCLIBS@ +Cflags: -I${includedir} diff -Naur bigdft-1.6-tuto_orig/configure bigdft-1.6-tuto/configure --- configure 2012-03-21 10:03:26.000000000 +0000