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 5EBE3139694 for ; Tue, 11 Apr 2017 14:52:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC66E21C102; Tue, 11 Apr 2017 14:52:38 +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 7203021C102 for ; Tue, 11 Apr 2017 14:52:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40E37341130 for ; Tue, 11 Apr 2017 14:52:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08C7C737F for ; Tue, 11 Apr 2017 14:52:36 +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: <1491922239.9dff7e7eecad5710bd17afa035a2e13d53bc3856.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.2-r1.ebuild sci-libs/arrayfire/arrayfire-3.4.2.ebuild sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch X-VCS-Directories: sci-libs/arrayfire/ sci-libs/arrayfire/files/ X-VCS-Committer: marbre X-VCS-Committer-Name: Marius Brehler X-VCS-Revision: 9dff7e7eecad5710bd17afa035a2e13d53bc3856 X-VCS-Branch: master Date: Tue, 11 Apr 2017 14:52:36 +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: 26473f4f-13ea-4402-842f-33eb3a8c2634 X-Archives-Hash: 064c0d374d51d2ebdb1a86f69bcd2b87 commit: 9dff7e7eecad5710bd17afa035a2e13d53bc3856 Author: Marius Brehler linux sungazer de> AuthorDate: Tue Apr 11 14:50:39 2017 +0000 Commit: Marius Brehler linux sungazer de> CommitDate: Tue Apr 11 14:50:39 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9dff7e7e sci-libs/arrayfire: Apply upstream patch to 3.4.2 Build fix for CUDA Compile PTX generated names by CMake 3.7 See https://github.com/arrayfire/arrayfire/issues/1755 Package-Manager: Portage-2.3.3, Repoman-2.3.1 ...fire-3.4.2.ebuild => arrayfire-3.4.2-r1.ebuild} | 2 ++ ...-fix-for-CUDA-Compile-PTX-generated-names.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/sci-libs/arrayfire/arrayfire-3.4.2.ebuild b/sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild similarity index 96% rename from sci-libs/arrayfire/arrayfire-3.4.2.ebuild rename to sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild index 51723b18c..0a9ff57d4 100644 --- a/sci-libs/arrayfire/arrayfire-3.4.2.ebuild +++ b/sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild @@ -53,6 +53,8 @@ S="${WORKDIR}/${PN}-full-${PV}" BUILD_DIR="${S}/build" CMAKE_BUILD_TYPE=Release +PATCHES=("${FILESDIR}/${P}-Build-fix-for-CUDA-Compile-PTX-generated-names.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.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch b/sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch new file mode 100644 index 000000000..3cc51b1b3 --- /dev/null +++ b/sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch @@ -0,0 +1,34 @@ +From 13c484e10537b52bcd012e6850520659769cece6 Mon Sep 17 00:00:00 2001 +From: Shehzan Mohammed +Date: Thu, 22 Dec 2016 18:10:54 -0500 +Subject: [PATCH] Build fix for CUDA Compile PTX generated names by CMake 3.7 + +--- + src/backend/cuda/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt +index 9cfa8a5..2f2045d 100644 +--- a/src/backend/cuda/CMakeLists.txt ++++ b/src/backend/cuda/CMakeLists.txt +@@ -315,8 +315,16 @@ foreach(ptx_src_file ${ptx_sources}) + + get_filename_component(_name "${ptx_src_file}" NAME_WE) + ++ # CUDA_COMPILE_PTX from CMake 3.7 has new features that require this change ++ # TODO Fix this with a more complete solution ++ IF(CMAKE_VERSION VERSION_LESS 3.7) # Before 3.7 ++ SET(NAME_APPEND "") ++ ELSE(CMAKE_VERSION VERSION_LESS 3.7) # 3.7 and newer ++ SET(NAME_APPEND "_1") ++ ENDIF(CMAKE_VERSION VERSION_LESS 3.7) ++ + set(_gen_file_name +- "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx_generated_${_name}.cu.ptx") ++ "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx${NAME_APPEND}_generated_${_name}.cu.ptx") + set(_out_file_name + "${PROJECT_BINARY_DIR}/src/backend/cuda/${_name}.ptx") + +-- +2.10.2 +