aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHonza Macháček <Hloupy.Honza@centrum.cz>2012-07-10 11:05:28 +0200
committerHonza Macháček <Hloupy.Honza@centrum.cz>2012-07-10 11:05:28 +0200
commitd2d78b15848661a5e5f197ece1fa1cf09ecca017 (patch)
tree1c4bbde107b2f53ff8c47549240a4201cf2803c4
parentremove old (diff)
downloadsci-d2d78b15848661a5e5f197ece1fa1cf09ecca017.tar.gz
sci-d2d78b15848661a5e5f197ece1fa1cf09ecca017.tar.bz2
sci-d2d78b15848661a5e5f197ece1fa1cf09ecca017.zip
The bigdft-1.6-tuto.1-GPUlibs.patch of sci-libs/bigdft-1.6_pre1-r3 updated not to forget the pkg-config file
-rw-r--r--sci-libs/bigdft/ChangeLog5
-rw-r--r--sci-libs/bigdft/Manifest4
-rw-r--r--sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch21
3 files changed, 28 insertions, 2 deletions
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 7a43f6b50..dad986751 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
<<<<<<< HEAD
+
+ 10 Jul 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ files/bigdft-1.6-tuto.1-GPUlibs.patch:
+ bigdft-1.6-tuto.1-GPUlibs.patch updated not to forget the pkg-config file
+
*bigdft-1.6_pre1-r3 (04 Jul 2012)
04 Jul 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest
index 02177f45a..5f1f645ce 100644
--- a/sci-libs/bigdft/Manifest
+++ b/sci-libs/bigdft/Manifest
@@ -1,2 +1,2 @@
-DIST bigdft-1.6-tuto.1.tar.gz 7510733 RMD160 1f759a7590491e2f143c592db01d0263646bae82 SHA1 5308af2e44b15a9a2c5d9cb14eec9b934a16c9f0 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
-DIST bigdft-1.6.0.tar.gz 8876759 RMD160 6cc9f8c87447d540e0677311dfb9a1da6c7f0150 SHA1 b4c75d0bf95ddf66d8cade96f4c1c625a2b71f1b SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
+DIST bigdft-1.6-tuto.1.tar.gz 7510733 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
+DIST bigdft-1.6.0.tar.gz 8876759 SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
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
index 386e39dc7..507966518 100644
--- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch
+++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch
@@ -1,3 +1,24 @@
+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