commit: 96db6869f3a26f1d8449086e21272ac7ba64d334 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Sun Mar 8 09:49:44 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Mar 8 09:49:44 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=96db6869
sci-libs/arrayfire: Update patches Package-Manager: portage-2.2.14 sci-libs/arrayfire/ChangeLog | 8 ++++++++ sci-libs/arrayfire/arrayfire-9999.ebuild | 7 +++++-- ...es.patch => arrayfire-0.9999-CMakeLists_examples.patch} | 0 ...uild_gtest.patch => arrayfire-0.9999-build_gtest.patch} | 0 .../files/arrayfire-9999-CMakeLists_examples.patch | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog index 18acb43..8f534c6 100644 --- a/sci-libs/arrayfire/ChangeLog +++ b/sci-libs/arrayfire/ChangeLog @@ -1,6 +1,14 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Mar 2015; Marius Brehler <[email protected]> + +files/arrayfire-0.9999-CMakeLists_examples.patch, + +files/arrayfire-0.9999-build_gtest.patch, + +files/arrayfire-9999-CMakeLists_examples.patch, + -files/CMakeLists_examples.patch, -files/build_gtest.patch, + arrayfire-9999.ebuild: + Update patches + 19 Feb 2015; Marius Brehler <[email protected]> arrayfire-9999.ebuild: Fix SLOT operators diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild index 5df0538..91c16ac 100644 --- a/sci-libs/arrayfire/arrayfire-9999.ebuild +++ b/sci-libs/arrayfire/arrayfire-9999.ebuild @@ -40,10 +40,13 @@ CMAKE_BUILD_TYPE=Release PATCHES=( "${FILESDIR}"/FindCBLAS.patch - "${FILESDIR}"/CMakeLists_examples.patch - "${FILESDIR}"/build_gtest.patch + "${FILESDIR}/${P}"-CMakeLists_examples.patch ) +if [[ ${PV} == "0.9999" ]] ; then + PATCHES+=("${FILESDIR}/${P}"-build_gtest.patch) +fi + # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage # user is (usually) not in the video group RESTRICT="userpriv" diff --git a/sci-libs/arrayfire/files/CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch similarity index 100% rename from sci-libs/arrayfire/files/CMakeLists_examples.patch rename to sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch diff --git a/sci-libs/arrayfire/files/build_gtest.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch similarity index 100% rename from sci-libs/arrayfire/files/build_gtest.patch rename to sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch diff --git a/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch new file mode 100644 index 0000000..56885cb1 --- /dev/null +++ b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch @@ -0,0 +1,14 @@ +Adjust installation path of examples. + +Patch by Marius Brehler. + +--- examples/CMakeLists.txt ++++ examples/CMakeLists.txt_new +@@ -18,6 +18,7 @@ MACRO(CREATE_EXAMPLES BACKEND) + COMPILE_FLAGS -DAF_${DEF_NAME} + OUTPUT_NAME ${EXAMPLE}_${BACKEND} + RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME}) ++ INSTALL(TARGETS ${EXAMPLE_NAME} DESTINATION share/arrayfire/examples) + ENDFOREACH() + ENDMACRO(CREATE_EXAMPLES) +
