diff options
author | Andreas Schäfer <gentryx@gmx.de> | 2013-01-29 21:40:47 +0100 |
---|---|---|
committer | Andreas Schäfer <gentryx@gmx.de> | 2013-01-29 21:40:47 +0100 |
commit | 4fe332f7fef46b7ac8f6264c44144d0e47ee0f49 (patch) | |
tree | f5ee6d52f2acdff5957096e0cdb3c820b9bac7e0 | |
parent | added likwid ebuild (diff) | |
download | sci-4fe332f7fef46b7ac8f6264c44144d0e47ee0f49.tar.gz sci-4fe332f7fef46b7ac8f6264c44144d0e47ee0f49.tar.bz2 sci-4fe332f7fef46b7ac8f6264c44144d0e47ee0f49.zip |
fixed compilation with newer cmake, removed currently unused use flags
-rw-r--r-- | sci-libs/libgeodecomp/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/libgeodecomp/files/cmake.patch | 17 | ||||
-rw-r--r-- | sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild | 28 | ||||
-rw-r--r-- | sci-libs/libgeodecomp/libgeodecomp-9999.ebuild | 22 |
4 files changed, 36 insertions, 34 deletions
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest index 35639d864..20657b9cb 100644 --- a/sci-libs/libgeodecomp/Manifest +++ b/sci-libs/libgeodecomp/Manifest @@ -1 +1,4 @@ +AUX cmake.patch 618 SHA256 924f236a1c085fbd3effeb5770447e554c35de0c6fa236d6e0b38c87af3c2e46 SHA512 eb993fc9730a4a5dd41c010d436f34ea2f9fe610eb76c76194097f8c62175278528085c4ff293bc5bef4677d0a0fee8b8e4c75942b65c2f654d4d6cdc8030dfa WHIRLPOOL a2861aca40433ba8ba54f6793c277027e421c9747af4f250d4d4c9177f65a57baee8ffa92c3d8487ded0c79d1274d28aab87722b794dd30f90206b96676f4ddb DIST libgeodecomp-0.1.0.tar.bz2 581136 SHA256 71442a60e7cc5c3f38e462d5d52010a948bd089759487687f217e4dec4dffae5 SHA512 56de4e6bfc92f8dda4d4931559a553a7a2c847205637394ea87f73dfb5a34776cb043beba2857bbe07c52a61ed457f22b7d76e4e23c183c8bd25868d36df4704 WHIRLPOOL df2b5c6830dbc92befd873bdced1712687046a43e814f7676271a2041a58c9e2562a86c6b4034343499f813136f38e298b33fa9a67911b726f42f323f666b03e +EBUILD libgeodecomp-0.1.0.ebuild 1122 SHA256 8eb55caeb0a90fd1799d77f98574c17a20929c54cf63277454ef0056b4d657e6 SHA512 11e03000bbc3f2bea602b1dad65d9a23d319f57c6dcca2a57e70bbe0e28bbe994a19ef3408735d4f8900e506ebeb37f5d3c435766138a546e61969d25db12da3 WHIRLPOOL e9072e36c32b17abb30be8e2182f22ced1354e8cf0dbdad69289e806f6abf0fbe3f65cd2b7df0191dc5f4f035c28f6aa4742b824c2e6e30d8772c4f62b93624e +EBUILD libgeodecomp-9999.ebuild 1176 SHA256 730710e5223253f2f500ca11a150945944868dfc8e2116a35b002913a1d596f3 SHA512 1f1cc02f6db36c22cc6d538b6eaf6b69b5d3641d172273eb619662fc3ea0e682bda1b7842ec3bc32afb9cc4c0a4e8b9bf52123be24f13bccb4641413abb297f8 WHIRLPOOL ee95bfb6f01ae473134029128ff9b1c6c026dbc7fbc4f35c8a949e077e934607e349ee8fd47815d6afe2dc687857b8d5dc3e5872986bcb5ddda683801cb63228 diff --git a/sci-libs/libgeodecomp/files/cmake.patch b/sci-libs/libgeodecomp/files/cmake.patch new file mode 100644 index 000000000..de6e42f41 --- /dev/null +++ b/sci-libs/libgeodecomp/files/cmake.patch @@ -0,0 +1,17 @@ +diff -ru libgeodecomp-0.1.0/src/util.cmake libgeodecomp-0.1.0-nju/src/util.cmake +--- libgeodecomp-0.1.0/src/util.cmake 2012-06-27 12:26:46.000000000 +0200 ++++ libgeodecomp-0.1.0-nju/src/util.cmake 2013-01-29 20:52:43.306376967 +0100 +@@ -54,11 +54,11 @@ + endforeach(i) + + if(STRIPPED_SOURCES) +- list(SORT STRIPPED_SOURCES ${STRIPPED_SOURCES}) ++ list(SORT STRIPPED_SOURCES) + endif(STRIPPED_SOURCES) + + if(STRIPPED_HEADERS) +- list(SORT STRIPPED_HEADERS ${STRIPPED_HEADERS}) ++ list(SORT STRIPPED_HEADERS) + endif(STRIPPED_HEADERS) + + set(MY_AUTO "set(SOURCES \${SOURCES}\n") diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild index 7ed246730..117f06b77 100644 --- a/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild +++ b/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild @@ -25,22 +25,14 @@ HOMEPAGE="http://www.libgeodecomp.org" LICENSE="LGPL-3.0" SLOT="0" -IUSE="cuda doc mpi opencl" +IUSE="mpi" -RDEPEND=">=dev-libs/boost-1.48 - cuda? ( dev-util/nvidia-cuda-toolkit ) - mpi? ( || ( - sys-cluster/openmpi[cxx] - sys-cluster/mpich2[cxx] - ) ) - opencl? ( virtual/opencl )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) -" +RDEPEND=">=dev-libs/boost-1.48" +DEPEND="${RDEPEND}" - - -# -D FEATURE_QT=false -D FEATURE_OPENCL=false -D FEATURE_CUDA=false mpi +src_prepare() { + epatch "${FILESDIR}/cmake.patch" +} src_compile() { cmake-utils_src_compile @@ -51,10 +43,8 @@ src_compile() { src_install() { cmake-utils_src_install - - dodoc README - if ( use doc); then - dohtml doc/html/* - fi } +src_test() { + cmake-utils_src_compile test +} diff --git a/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild b/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild index 180654490..5aae3e000 100644 --- a/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild +++ b/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild @@ -25,22 +25,11 @@ HOMEPAGE="http://www.libgeodecomp.org" LICENSE="LGPL-3.0" SLOT="0" -IUSE="cuda doc mpi opencl" - -RDEPEND=">=dev-libs/boost-1.48 - cuda? ( dev-util/nvidia-cuda-toolkit ) - mpi? ( || ( - sys-cluster/openmpi[cxx] - sys-cluster/mpich2[cxx] - ) ) - opencl? ( virtual/opencl )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) -" - - +IUSE="doc" -# -D FEATURE_QT=false -D FEATURE_OPENCL=false -D FEATURE_CUDA=false mpi +RDEPEND=">=dev-libs/boost-1.48" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" src_compile() { cmake-utils_src_compile @@ -58,3 +47,6 @@ src_install() { fi } +src_test() { + cmake-utils_src_compile test +} |