From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9DD761395E2 for ; Thu, 1 Dec 2016 09:01:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D23B121C054; Thu, 1 Dec 2016 09:01:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4A1921C054 for ; Thu, 1 Dec 2016 09:01:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C6303413FD for ; Thu, 1 Dec 2016 09:00:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0901649A for ; Thu, 1 Dec 2016 09:00:56 +0000 (UTC) From: "Marius Brehler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marius Brehler" Message-ID: <1480582828.a2fd90ae05dcc27d04772022a8563de2a9da5ff0.marbre@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/arrayfire-3.4.1-r1.ebuild sci-libs/arrayfire/arrayfire-3.4.1.ebuild sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch X-VCS-Directories: sci-libs/arrayfire/ sci-libs/arrayfire/files/ X-VCS-Committer: marbre X-VCS-Committer-Name: Marius Brehler X-VCS-Revision: a2fd90ae05dcc27d04772022a8563de2a9da5ff0 X-VCS-Branch: master Date: Thu, 1 Dec 2016 09:00:56 +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: 32bf611e-adae-49ce-8bad-e4aed41d033a X-Archives-Hash: d6d39fbdf6fe21af9ed9414d2933a134 commit: a2fd90ae05dcc27d04772022a8563de2a9da5ff0 Author: Marius Brehler linux sungazer de> AuthorDate: Thu Dec 1 09:00:02 2016 +0000 Commit: Marius Brehler linux sungazer de> CommitDate: Thu Dec 1 09:00:28 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a2fd90ae sci-libs/arrayfire: Fix FindCBLAS.cmake in 3.4.1-r1 Package-Manager: portage-2.3.0 ...fire-3.4.1.ebuild => arrayfire-3.4.1-r1.ebuild} | 2 ++ .../files/arrayfire-3.4.1-FindCBLAS.patch | 37 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild similarity index 98% rename from sci-libs/arrayfire/arrayfire-3.4.1.ebuild rename to sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild index 8c80bc3..563042a 100644 --- a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild +++ b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild @@ -52,6 +52,8 @@ S="${WORKDIR}/${PN}-full-${PV}" BUILD_DIR="${S}/build" CMAKE_BUILD_TYPE=Release +PATCHES=("${FILESDIR}/${P}-FindCBLAS.patch") + # 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/arrayfire-3.4.1-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch new file mode 100644 index 0000000..b75569f --- /dev/null +++ b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch @@ -0,0 +1,37 @@ +https://github.com/arrayfire/arrayfire/pull/1657 + + +From 23228318b153bdc5bb30e084f9310b09b1644bd0 Mon Sep 17 00:00:00 2001 +From: Marius Brehler +Date: Wed, 30 Nov 2016 14:07:21 +0100 +Subject: [PATCH] FindCBLAS.cmake: Fix setting CBLAS_INCLUDE_DIR if PkgConfig + is used + +--- + CMakeModules/FindCBLAS.cmake | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake +index fbb646b..058b7d7 100644 +--- a/CMakeModules/FindCBLAS.cmake ++++ b/CMakeModules/FindCBLAS.cmake +@@ -39,8 +39,14 @@ IF(PC_CBLAS_FOUND) + LIST(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) + ENDFOREACH(PC_LIB) + +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES) +- MARK_AS_ADVANCED(CBLAS_LIBRARIES) ++ FIND_PATH(CBLAS_INCLUDE_DIRS NAMES cblas.h HINTS ${PC_CBLAS_INCLUDE_DIRS} ) ++ IF (NOT CBLAS_INCLUDE_DIRS) ++ message(FATAL_ERROR "Something is wrong in your pkg-config file - cblas.h not found in ${PC_CBLAS_INCLUDE_DIRS}") ++ ENDIF (NOT CBLAS_INCLUDE_DIRS) ++ SET(CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS}) ++ ++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES CBLAS_INCLUDE_DIR) ++ MARK_AS_ADVANCED(CBLAS_LIBRARIES CBLAS_INCLUDE_DIR) + + ELSE(PC_CBLAS_FOUND) + +-- +2.7.3 +