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 86A5D1384AE for ; Sat, 19 Sep 2015 12:51:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAB2D21C00D; Sat, 19 Sep 2015 12:51:32 +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 4C4D721C00D for ; Sat, 19 Sep 2015 12:51:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1530340DC7 for ; Sat, 19 Sep 2015 12:51:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68D8E183 for ; Sat, 19 Sep 2015 12:51:25 +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: <1442565372.c4d7001938b7ff967f4d9af2aee645fcecc91f85.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-3.0.2.ebuild sci-libs/arrayfire/arrayfire-3.0_beta.ebuild sci-libs/arrayfire/arrayfire-3.1.0.ebuild sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch X-VCS-Directories: sci-libs/arrayfire/ sci-libs/arrayfire/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c4d7001938b7ff967f4d9af2aee645fcecc91f85 X-VCS-Branch: master Date: Sat, 19 Sep 2015 12:51:25 +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: d66a7316-5bfe-4c70-b800-032ba4c40ce4 X-Archives-Hash: e8d3eb695e33f54767c42817e76b1ef2 commit: c4d7001938b7ff967f4d9af2aee645fcecc91f85 Author: Marius Brehler linux sungazer de> AuthorDate: Fri Sep 18 08:35:51 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Sep 18 08:36:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4d70019 sci-libs/arrayfire: Drop old Package-Manager: portage-2.2.20.1 sci-libs/arrayfire/ChangeLog | 7 ++ sci-libs/arrayfire/arrayfire-3.0.2.ebuild | 100 --------------------- sci-libs/arrayfire/arrayfire-3.0_beta.ebuild | 94 ------------------- sci-libs/arrayfire/arrayfire-3.1.0.ebuild | 100 --------------------- .../arrayfire-3.0_beta-FindBoostCompute.patch | 34 ------- .../files/arrayfire-3.0_beta-FindCBLAS.patch | 52 ----------- .../arrayfire-3.0_beta-opencl_CMakeLists.patch | 26 ------ 7 files changed, 7 insertions(+), 406 deletions(-) diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog index acf4051..d7a241b 100644 --- a/sci-libs/arrayfire/ChangeLog +++ b/sci-libs/arrayfire/ChangeLog @@ -1,6 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 18 Sep 2015; Marius Brehler + -arrayfire-3.0.2.ebuild, -arrayfire-3.0_beta.ebuild, -arrayfire-3.1.0.ebuild, + -files/arrayfire-3.0_beta-FindBoostCompute.patch, + -files/arrayfire-3.0_beta-FindCBLAS.patch, + -files/arrayfire-3.0_beta-opencl_CMakeLists.patch: + sci-libs/arrayfire: Drop old + *arrayfire-3.1.1-r1 (17 Sep 2015) 17 Sep 2015; Marius Brehler diff --git a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild b/sci-libs/arrayfire/arrayfire-3.0.2.ebuild deleted file mode 100644 index 7c43ce3..0000000 --- a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -GTEST_PV="1.7.0" - -DESCRIPTION="A general purpose GPU library." -HOMEPAGE="http://www.arrayfire.com/" -SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 -test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" -KEYWORDS="~amd64" - -LICENSE="BSD" -SLOT="0" -IUSE="+examples +cpu cuda opencl test" - -RDEPEND=" - >=sys-devel/gcc-4.7:* - media-libs/freeimage - cuda? ( - >=dev-util/nvidia-cuda-toolkit-6.0 - dev-libs/boost - ) - cpu? ( - virtual/blas - virtual/cblas - virtual/lapacke - sci-libs/fftw:3.0 - ) - opencl? ( - virtual/blas - virtual/cblas - virtual/lapacke - dev-libs/boost - dev-libs/boost-compute - >=sci-libs/clblas-2.4 - >=sci-libs/clfft-2.6.1 - )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" -BUILD_DIR="${S}/build" -CMAKE_BUILD_TYPE=Release - -PATCHES=( - "${FILESDIR}/${PN}"-9999-FindCBLAS.patch - "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.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" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then - die "Compilation with gcc older than 4.7 is not supported." - fi - fi -} - -src_unpack() { - default - - if use test; then - mkdir -p "${BUILD_DIR}"/third_party/src/ || die - mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die - fi -} - -src_configure() { - if use cuda; then - addwrite /dev/nvidiactl - addwrite /dev/nvidia0 - addwrite /dev/nvidia-uvm - fi - - local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - -DUSE_SYSTEM_BOOST_COMPUTE=ON - -DUSE_SYSTEM_CLBLAS=ON - -DUSE_SYSTEM_CLFFT=ON - -DBUILD_GRAPHICS=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobin "${BUILD_DIR}/bin2cpp" -} diff --git a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild b/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild deleted file mode 100644 index 75337f0..0000000 --- a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils git-r3 - -GTEST_PV="1.7.0" - -DESCRIPTION="A general purpose GPU library." -HOMEPAGE="http://www.arrayfire.com/" -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git://github.com/${PN}/${PN}.git" -SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" -KEYWORDS="~amd64" -EGIT_COMMIT="v3.0beta" - -LICENSE="BSD" -SLOT="0" -IUSE="+examples +cpu cuda opencl test" - -RDEPEND=" - >=sys-devel/gcc-4.7:* - cuda? ( - >=dev-util/nvidia-cuda-toolkit-6.0 - dev-libs/boost - ) - cpu? ( - virtual/blas - virtual/cblas - sci-libs/fftw:3.0 - ) - opencl? ( - dev-libs/boost - dev-libs/boost-compute - sci-libs/clblas - sci-libs/clfft - )" -DEPEND="${RDEPEND}" - -BUILD_DIR="${S}/build" -CMAKE_BUILD_TYPE=Release - -PATCHES=( - "${FILESDIR}"/${P}-FindCBLAS.patch - "${FILESDIR}"/${P}-FindBoostCompute.patch - "${FILESDIR}"/${P}-opencl_CMakeLists.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" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then - die "Compilation with gcc older than 4.7 is not supported." - fi - fi -} - -src_unpack() { - git-r3_src_unpack - - if use test; then - mkdir -p "${BUILD_DIR}"/third_party/src/ || die - cd "${BUILD_DIR}"/third_party/src/ || die - unpack ${A} - mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die - fi -} - -src_configure() { - if use cuda; then - addwrite /dev/nvidiactl - addwrite /dev/nvidia0 - addwrite /dev/nvidia-uvm - fi - - local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobin "${BUILD_DIR}/bin2cpp" -} diff --git a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild b/sci-libs/arrayfire/arrayfire-3.1.0.ebuild deleted file mode 100644 index 4703028..0000000 --- a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -GTEST_PV="1.7.0" - -DESCRIPTION="A general purpose GPU library." -HOMEPAGE="http://www.arrayfire.com/" -SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 -test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" -KEYWORDS="~amd64" - -LICENSE="BSD" -SLOT="0" -IUSE="+examples +cpu cuda opencl test" - -RDEPEND=" - >=sys-devel/gcc-4.7:* - media-libs/freeimage - cuda? ( - >=dev-util/nvidia-cuda-toolkit-6.0 - dev-libs/boost - ) - cpu? ( - virtual/blas - virtual/cblas - virtual/lapacke - sci-libs/fftw:3.0 - ) - opencl? ( - virtual/blas - virtual/cblas - virtual/lapacke - dev-libs/boost - dev-libs/boost-compute - >=sci-libs/clblas-2.4 - >=sci-libs/clfft-2.6.1 - )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-full-${PV}" -BUILD_DIR="${S}/build" -CMAKE_BUILD_TYPE=Release - -PATCHES=( - "${FILESDIR}/${PN}"-9999-FindCBLAS.patch - "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.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" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then - die "Compilation with gcc older than 4.7 is not supported." - fi - fi -} - -src_unpack() { - default - - if use test; then - mkdir -p "${BUILD_DIR}"/third_party/src/ || die - mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die - fi -} - -src_configure() { - if use cuda; then - addwrite /dev/nvidiactl - addwrite /dev/nvidia0 - addwrite /dev/nvidia-uvm - fi - - local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - -DUSE_SYSTEM_BOOST_COMPUTE=ON - -DUSE_SYSTEM_CLBLAS=ON - -DUSE_SYSTEM_CLFFT=ON - -DBUILD_GRAPHICS=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobin "${BUILD_DIR}/bin2cpp" -} diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch deleted file mode 100644 index 3052df2..0000000 --- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch +++ /dev/null @@ -1,34 +0,0 @@ -Set BoostCompute inlcude dir. - -Patch by Marius Brehler. - ---- CMakeModules/FindBoostCompute.cmake -+++ CMakeModules/FindBoostCompute.cmake -@@ -3,25 +3,10 @@ - # * BoostCompute_FOUND Flag for Boost Compute - # * BoostCompute_INCLUDE_DIR Location of the Boost Compute headers - --# Look a directory above for the Boost Compute folder --FIND_PATH( BoostCompute_SOURCE_DIR -- NAMES include/boost/compute.hpp -- PATH_SUFFIXES compute BoostCompute -- DOC "Location of the Boost Compute source directory" -- PATHS ${CMAKE_SOURCE_DIR}/.. -- ${CMAKE_SOURCE_DIR}/../.. -- /usr/local) - --FIND_PATH( BoostCompute_INCLUDE_DIR -- NAMES boost/compute.hpp -- DOC "Location of the Boost Compute include directory." -- PATHS ${BoostCompute_SOURCE_DIR}/include) -+set(BoostCompute_INCLUDE_DIR "/usr/include/compute") -+SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" ) - --IF(BoostCompute_INCLUDE_DIR AND BoostCompute_SOURCE_DIR) -- SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" ) --ELSE() -- SET( BoostCompute_FOUND OFF CACHE BOOL "BoostCompute Found" ) --ENDIF() - - IF(NOT BoostCompute_FOUND) - MESSAGE(FATAL_ERROR, "Boost.Compute not found! Clone Boost.Compute from https://github.com/kylelutz/compute.git") diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch deleted file mode 100644 index 263c62a..0000000 --- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch +++ /dev/null @@ -1,52 +0,0 @@ -Use pkg-config to find cblas. - -Patch by Marius Brehler. - ---- b/CMakeModules/FindCBLAS.cmake -+++ a/CMakeModules/FindCBLAS.cmake -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for cblas is found, this overrides and cancels -+# all further checks. -+# -+ - # Using FindCBLAS.cmake from the following repo - # https://github.com/clementfarabet/THC/blob/master/COPYRIGHT.txt - -@@ -18,6 +24,29 @@ SET(CBLAS_LIBRARIES) - SET(CBLAS_INCLUDE_DIR) - SET(CBLAS_INCLUDE_FILE) - -+ -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_CBLAS cblas) -+if(PC_CBLAS_FOUND) -+ foreach(PC_LIB ${PC_CBLAS_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_CBLAS_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_CBLAS_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ 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) -+else(PC_CBLAS_FOUND) -+message(STATUS "No PkgConfig configuration for CBLAS found; starting more extensive search.") -+ -+ -+ -+ -+ - # CBLAS in Intel mkl - FIND_PACKAGE(MKL) - IF (MKL_FOUND AND NOT CBLAS_LIBRARIES) -@@ -203,3 +232,5 @@ IF(NOT CBLAS_FIND_QUIETLY) - MESSAGE(STATUS "CBLAS library not found.") - ENDIF(CBLAS_FOUND) - ENDIF(NOT CBLAS_FIND_QUIETLY) -+ -+endif(PC_CBLAS_FOUND) diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch deleted file mode 100644 index 7279afa..0000000 --- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not install clFFT/clBLAS headers. - -Patch by Marius Brehler. - ---- src/backend/opencl/CMakeLists.txt -+++ src/backend/opencl/CMakeLists.txt -@@ -18,9 +18,6 @@ ADD_DEFINITIONS(-DAF_OPENCL - FIND_PACKAGE(CLBLAS REQUIRED) - INCLUDE_DIRECTORIES(${CLBLAS_INCLUDE_DIRS}) - LINK_DIRECTORIES(${CLBLAS_LIBRARY_DIR}) --# Custom install command --INSTALL(DIRECTORY "${CLBLAS_PACKAGE_DIR}/include/" DESTINATION include -- COMPONENT headers) - IF(UNIX) - FILE(GLOB CLBLAS_LIBS "${CLBLAS_PACKAGE_DIR}/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*") - ELSEIF(WIN32) -@@ -33,9 +30,6 @@ INSTALL(FILES ${CLBLAS_LIBS} DESTINATION - FIND_PACKAGE(clFFT REQUIRED) - INCLUDE_DIRECTORIES(${CLFFT_INCLUDE_DIRS}) - LINK_DIRECTORIES(${CLFFT_LIBRARY_DIR}) --# Custom install command --INSTALL(DIRECTORY "${CLFFT_BUILD_DIR}/package/include/" DESTINATION include -- COMPONENT headers) - IF(UNIX) - FILE(GLOB CLFFT_LIBS "${CLFFT_BUILD_DIR}/package/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*") - ELSE(UNIX)