Gentoo Archives: gentoo-commits

From: "Honza Macháček" <Hloupy.Honza@×××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/, sci-libs/bigdft/files/
Date: Tue, 10 Jul 2012 09:05:59
Message-Id: 1341911128.d2d78b15848661a5e5f197ece1fa1cf09ecca017.honza_machacek@gentoo
1 commit: d2d78b15848661a5e5f197ece1fa1cf09ecca017
2 Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
3 AuthorDate: Tue Jul 10 09:05:28 2012 +0000
4 Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
5 CommitDate: Tue Jul 10 09:05:28 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2d78b15
7
8 The bigdft-1.6-tuto.1-GPUlibs.patch of sci-libs/bigdft-1.6_pre1-r3 updated not to forget the pkg-config file
9
10 ---
11 sci-libs/bigdft/ChangeLog | 5 ++++
12 .../bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch | 21 ++++++++++++++++++++
13 2 files changed, 26 insertions(+), 0 deletions(-)
14
15 diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
16 index 7a43f6b..dad9867 100644
17 --- a/sci-libs/bigdft/ChangeLog
18 +++ b/sci-libs/bigdft/ChangeLog
19 @@ -3,6 +3,11 @@
20 # $Header: $
21
22 <<<<<<< HEAD
23 +
24 + 10 Jul 2012; Honza Macháček <Hloupy.Honza@×××××××.cz>
25 + files/bigdft-1.6-tuto.1-GPUlibs.patch:
26 + bigdft-1.6-tuto.1-GPUlibs.patch updated not to forget the pkg-config file
27 +
28 *bigdft-1.6_pre1-r3 (04 Jul 2012)
29
30 04 Jul 2012; Honza Macháček <Hloupy.Honza@×××××××.cz>
31
32 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.patch
33 index 386e39d..5079665 100644
34 --- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch
35 +++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch
36 @@ -1,3 +1,24 @@
37 +diff -Naur orig/bigdft-1.6-tuto.1.orig/configure.ac patched/bigdft-1.6-tuto.1/configure.ac
38 +--- bigdft-1.6-tuto.1.orig/configure.ac 2012-07-10 08:50:27.000000000 +0000
39 ++++ bigdft-1.6-tuto.1/configure.ac 2012-07-10 09:03:46.303491671 +0000
40 +@@ -295,7 +295,7 @@ if test x"$ac_use_cuda_gpu" = "xyes" ; t
41 + fi
42 + fi
43 + AC_SUBST(NVCC_FLAGS)
44 +- LIBCUDA_LIBS="-L$ac_cuda_lib_path -lcudart -lcublas"
45 ++ LIBCUDA_LIBS="-L$ac_cuda_lib_path -lGPU -lcudart -lcublas"
46 + fi
47 +
48 + dnl Use the OpenCL support
49 +@@ -332,7 +332,7 @@ if test x"$ac_use_ocl" = "xyes" ; then
50 + ac_use_ocl="no"
51 + else
52 + dnl LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm -lrt -lstdc++"
53 +- LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm"
54 ++ LIBOCL_LIBS="-L$ac_ocl_path/lib -lOCL -lOpenCL -lm"
55 + fi
56 + LIBS=$LIBS_OLD
57 + fi
58 diff -Naur orig/bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am patched/bigdft-1.6-tuto.1/src/CUDA/Makefile.am
59 --- bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am 2011-09-27 12:43:06.000000000 +0000
60 +++ bigdft-1.6-tuto.1/src/CUDA/Makefile.am 2012-07-04 12:08:27.000000000 +0000