From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 13662138ACE for ; Sun, 8 Mar 2015 18:09:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50475E0B0E; Sun, 8 Mar 2015 18:09:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35AF1E0B0E for ; Sun, 8 Mar 2015 18:09:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D68C3408C7 for ; Sun, 8 Mar 2015 18:09:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88C4813529 for ; Sun, 8 Mar 2015 18:08:57 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1425808184.96db6869f3a26f1d8449086e21272ac7ba64d334.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/arrayfire/ChangeLog sci-libs/arrayfire/arrayfire-9999.ebuild sci-libs/arrayfire/files/CMakeLists_examples.patch sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch sci-libs/arrayfire/files/build_gtest.patch X-VCS-Directories: sci-libs/arrayfire/files/ sci-libs/arrayfire/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 96db6869f3a26f1d8449086e21272ac7ba64d334 X-VCS-Branch: master Date: Sun, 8 Mar 2015 18:08:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f572cdb4-3020-4852-88b1-bd31592cae8c X-Archives-Hash: 7707f5035a58c8ffd530278ea6bf1d8a commit: 96db6869f3a26f1d8449086e21272ac7ba64d334 Author: Marius Brehler linux sungazer de> AuthorDate: Sun Mar 8 09:49:44 2015 +0000 Commit: Justin Lecher gentoo 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 + +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 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) +