1 |
commit: e4450bb769287be345b4ab831aee1102f537286e |
2 |
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz> |
3 |
AuthorDate: Sat Sep 1 09:32:43 2012 +0000 |
4 |
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz> |
5 |
CommitDate: Sat Sep 1 09:32:43 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4450bb7 |
7 |
|
8 |
Patches for sci-libs/bigdft to install GPU support corrected not to break linking against the compiled libraries |
9 |
|
10 |
--- |
11 |
sci-libs/bigdft/ChangeLog | 11 ++++++++++ |
12 |
....6_pre1-r3.ebuild => bigdft-1.6_pre1-r4.ebuild} | 4 +- |
13 |
...ibs.patch => bigdft-1.6-tuto.1-GPUlibs-1.patch} | 21 -------------------- |
14 |
...c.patch => bigdft-1.6-tuto.1-bigdft.pc-1.patch} | 8 +++++- |
15 |
4 files changed, 19 insertions(+), 25 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog |
18 |
index dad9867..1f24f09 100644 |
19 |
--- a/sci-libs/bigdft/ChangeLog |
20 |
+++ b/sci-libs/bigdft/ChangeLog |
21 |
@@ -4,6 +4,17 @@ |
22 |
|
23 |
<<<<<<< HEAD |
24 |
|
25 |
+*bigdft-1.6_pre1-r4 (01 Sep 2012) |
26 |
+ |
27 |
+ 01 Sep 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> |
28 |
+ -bigdft-1.6_pre1-r3.ebuild, +bigdft-1.6_pre1-r4.ebuild, |
29 |
+ -files/bigdft-1.6-tuto.1-GPUlibs.patch, |
30 |
+ +files/bigdft-1.6-tuto.1-GPUlibs-1.patch, |
31 |
+ -files/bigdft-1.6-tuto.1-bigdft.pc.patch, |
32 |
+ +files/bigdft-1.6-tuto.1-bigdft.pc-1.patch: |
33 |
+ Patches to install GPU support corrected not to break linking against the |
34 |
+ compiled libraries |
35 |
+ |
36 |
10 Jul 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> |
37 |
files/bigdft-1.6-tuto.1-GPUlibs.patch: |
38 |
bigdft-1.6-tuto.1-GPUlibs.patch updated not to forget the pkg-config file |
39 |
|
40 |
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild |
41 |
similarity index 97% |
42 |
rename from sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild |
43 |
rename to sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild |
44 |
index a2cef02..95bbebf 100644 |
45 |
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild |
46 |
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild |
47 |
@@ -64,9 +64,9 @@ pkg_setup() { |
48 |
src_prepare() { |
49 |
epatch \ |
50 |
"${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ |
51 |
- "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch \ |
52 |
+ "${FILESDIR}"/"${REAL_P}"-bigdft.pc-1.patch \ |
53 |
"${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \ |
54 |
- "${FILESDIR}"/"${REAL_P}"-GPUlibs.patch |
55 |
+ "${FILESDIR}"/"${REAL_P}"-GPUlibs-1.patch |
56 |
sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die |
57 |
sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die |
58 |
eautoreconf |
59 |
|
60 |
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 |
61 |
similarity index 62% |
62 |
rename from sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch |
63 |
rename to sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch |
64 |
index 5079665..386e39d 100644 |
65 |
--- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch |
66 |
+++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch |
67 |
@@ -1,24 +1,3 @@ |
68 |
-diff -Naur orig/bigdft-1.6-tuto.1.orig/configure.ac patched/bigdft-1.6-tuto.1/configure.ac |
69 |
---- bigdft-1.6-tuto.1.orig/configure.ac 2012-07-10 08:50:27.000000000 +0000 |
70 |
-+++ bigdft-1.6-tuto.1/configure.ac 2012-07-10 09:03:46.303491671 +0000 |
71 |
-@@ -295,7 +295,7 @@ if test x"$ac_use_cuda_gpu" = "xyes" ; t |
72 |
- fi |
73 |
- fi |
74 |
- AC_SUBST(NVCC_FLAGS) |
75 |
-- LIBCUDA_LIBS="-L$ac_cuda_lib_path -lcudart -lcublas" |
76 |
-+ LIBCUDA_LIBS="-L$ac_cuda_lib_path -lGPU -lcudart -lcublas" |
77 |
- fi |
78 |
- |
79 |
- dnl Use the OpenCL support |
80 |
-@@ -332,7 +332,7 @@ if test x"$ac_use_ocl" = "xyes" ; then |
81 |
- ac_use_ocl="no" |
82 |
- else |
83 |
- dnl LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm -lrt -lstdc++" |
84 |
-- LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm" |
85 |
-+ LIBOCL_LIBS="-L$ac_ocl_path/lib -lOCL -lOpenCL -lm" |
86 |
- fi |
87 |
- LIBS=$LIBS_OLD |
88 |
- fi |
89 |
diff -Naur orig/bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am patched/bigdft-1.6-tuto.1/src/CUDA/Makefile.am |
90 |
--- bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am 2011-09-27 12:43:06.000000000 +0000 |
91 |
+++ bigdft-1.6-tuto.1/src/CUDA/Makefile.am 2012-07-04 12:08:27.000000000 +0000 |
92 |
|
93 |
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 |
94 |
similarity index 96% |
95 |
rename from sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch |
96 |
rename to sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch |
97 |
index 3ddde70..7c3380a 100644 |
98 |
--- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch |
99 |
+++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch |
100 |
@@ -158,7 +158,11 @@ diff -Naur bigdft-1.6-tuto_orig/Makefile.in bigdft-1.6-tuto/Makefile.in |
101 |
diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in |
102 |
--- bigdft.pc.in 1970-01-01 00:00:00.000000000 +0000 |
103 |
+++ bigdft.pc.in 2012-02-01 09:43:59.000000000 +0000 |
104 |
-@@ -0,0 +1,11 @@ |
105 |
+@@ -0,0 +1,15 @@ |
106 |
++@USE_CUDA_GPU_FALSE@libs_cuda= |
107 |
++@USE_CUDA_GPU_TRUE@libs_cuda=$(top_builddir)/src/CUDA/libGPU.a |
108 |
++@USE_OCL_FALSE@libs_ocl= |
109 |
++@USE_OCL_TRUE@libs_ocl=$(top_builddir)/src/OpenCL/libOCL.a -lstdc++ |
110 |
+prefix=@prefix@ |
111 |
+exec_prefix=@exec_prefix@ |
112 |
+libdir=@libdir@ |
113 |
@@ -168,7 +172,7 @@ diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in |
114 |
+Description: Library for DFT calculation over wavelets. |
115 |
+Requires: |
116 |
+Version: @VERSION@ |
117 |
-+Libs: -L${libdir} -lbigdft -lpoissonsolver @LIBS@ @FCLIBS@ |
118 |
++Libs: -L${libdir} -lbigdft -lpoissonsolver ${libs_cuda} ${libs_ocl} @LIBS@ @FCLIBS@ |
119 |
+Cflags: -I${includedir} |
120 |
diff -Naur bigdft-1.6-tuto_orig/configure bigdft-1.6-tuto/configure |
121 |
--- configure 2012-03-21 10:03:26.000000000 +0000 |