commit: b54eee7590728ac2045cd044f70eb041f610f7a6
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Sep 14 18:31:17 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 18:32:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b54eee75
sci-libs/arrayfire: Remove patches (merged upstream)
Package-Manager: portage-2.2.20.1
sci-libs/arrayfire/ChangeLog | 6 +
sci-libs/arrayfire/arrayfire-9999.ebuild | 5 -
.../arrayfire/files/arrayfire-9999-FindCBLAS.patch | 52 ------
...re-9999-Try-PkgConf-first-to-find-LAPACKE.patch | 182 ---------------------
4 files changed, 6 insertions(+), 239 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 9eecff5..3c8c0e2 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 14 Sep 2015; Marius Brehler <mar...@linux.sungazer.de>
+ -files/arrayfire-9999-FindCBLAS.patch,
+ -files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,
+ arrayfire-9999.ebuild:
+ sci-libs/arrayfire: Remove patches (merged upstream)
+
*arrayfire-3.1.1 (14 Sep 2015)
14 Sep 2015; Marius Brehler <mar...@linux.sungazer.de>
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild
b/sci-libs/arrayfire/arrayfire-9999.ebuild
index b2fea92..c84ddd6 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -45,11 +45,6 @@ DEPEND="${RDEPEND}"
BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
-PATCHES=(
- "${FILESDIR}/${P}"-FindCBLAS.patch
- "${FILESDIR}/${P}"-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"
diff --git a/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
deleted file mode 100644
index 7f757e8..0000000
--- a/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Use pkg-config to find cblas.
-
-Patch by Marius Brehler.
-
---- CMakeModules/FindCBLAS.cmake 2015-05-23 17:12:41.000000000 +0200
-+++ CMakeModules/FindCBLAS.cmake.new 2015-05-23 17:13:51.000000000 +0200
-@@ -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
-
-@@ -21,6 +27,29 @@ SET(CBLAS_INCLUDE_DIR CACHE STRING
- SET(CBLAS_INCLUDE_FILE CACHE STRING
- "CBLAS header name")
-
-+
-+#
-+# 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.")
-+
-+
-+
-+
-+
- SET(INTEL_MKL_ROOT_DIR CACHE STRING
- "Root directory of the Intel MKL")
-
-@@ -277,3 +306,5 @@ IF(NOT CBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "CBLAS library not found.")
- ENDIF()
- ENDIF(NOT CBLAS_FIND_QUIETLY)
-+
-+endif(PC_CBLAS_FOUND)
diff --git
a/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
b/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
deleted file mode 100644
index 549b7b8..0000000
---
a/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 0c64e3d30dce121fe41d0149592be3a0a605588a Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.breh...@tu-dortmund.de>
-Date: Tue, 8 Sep 2015 09:50:12 +0200
-Subject: [PATCH] Try PkgConf first to find LAPACKE
-
----
- CMakeModules/FindLAPACKE.cmake | 145 ++++++++++++++++++++++++-----------------
- 1 file changed, 87 insertions(+), 58 deletions(-)
-
-diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake
-index 05d218a..3bdc273 100644
---- a/CMakeModules/FindLAPACKE.cmake
-+++ b/CMakeModules/FindLAPACKE.cmake
-@@ -18,70 +18,23 @@ FIND_PACKAGE(PkgConfig)
-
- #Determine from PKG
- IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT)
-- PKG_CHECK_MODULES( PKG_LAPACKE QUIET "lapacke")
-+ PKG_CHECK_MODULES( PC_LAPACKE QUIET "lapacke")
- ENDIF()
-
--IF(LAPACKE_ROOT)
-- #find libs
-- FIND_LIBRARY(
-- LAPACKE_LIB
-- NAMES "lapacke" "LAPACKE" "liblapacke"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "lib" "lib64"
-- DOC "LAPACKE Library"
-- NO_DEFAULT_PATH
-- )
-- FIND_LIBRARY(
-- LAPACK_LIB
-- NAMES "lapack" "LAPACK" "liblapack"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "lib" "lib64"
-- DOC "LAPACK Library"
-- NO_DEFAULT_PATH
-- )
-- FIND_PATH(
-- LAPACKE_INCLUDES
-- NAMES "lapacke.h"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "include"
-- DOC "LAPACKE Include Directory"
-- NO_DEFAULT_PATH
-- )
-+IF(PC_LAPACKE_FOUND)
-+ FOREACH(PC_LIB ${PC_LAPACKE_LIBRARIES})
-+ FIND_LIBRARY(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS
${PC_LAPACKE_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_LAPACKE_LIBRARY_DIRS}")
-+ ENDIF (NOT ${PC_LIB}_LIBRARY)
-+ LIST(APPEND LAPACKE_LIB ${${PC_LIB}_LIBRARY})
-+ ENDFOREACH(PC_LIB)
-
--ELSE()
-- FIND_LIBRARY(
-- LAPACKE_LIB
-- NAMES "lapacke" "liblapacke"
-- PATHS
-- ${PKG_LAPACKE_LIBRARY_DIRS}
-- ${LIB_INSTALL_DIR}
-- /usr/lib64
-- /usr/lib
-- /usr/local/lib64
-- /usr/local/lib
-- /sw/lib
-- /opt/local/lib
-- DOC "LAPACKE Library"
-- )
-- FIND_LIBRARY(
-- LAPACK_LIB
-- NAMES "lapack" "liblapack"
-- PATHS
-- ${PKG_LAPACKE_LIBRARY_DIRS}
-- ${LIB_INSTALL_DIR}
-- /usr/lib64
-- /usr/lib
-- /usr/local/lib64
-- /usr/local/lib
-- /sw/lib
-- /opt/local/lib
-- DOC "LAPACK Library"
-- )
- FIND_PATH(
- LAPACKE_INCLUDES
- NAMES "lapacke.h"
- PATHS
-- ${PKG_LAPACKE_INCLUDE_DIRS}
-+ ${PC_LAPACKE_INCLUDE_DIRS}
- ${INCLUDE_INSTALL_DIR}
- /usr/include
- /usr/local/include
-@@ -89,7 +42,83 @@ ELSE()
- /opt/local/include
- DOC "LAPACKE Include Directory"
- )
--ENDIF(LAPACKE_ROOT)
-+
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACKE DEFAULT_MSG LAPACKE_LIB)
-+ MARK_AS_ADVANCED(LAPACKE_INCLUDES LAPACKE_LIB)
-+
-+ELSE(PC_LAPACKE_FOUND)
-+ MESSAGE(STATUS "No PkgConfig configuration for LAPACKE found; starting
more extensive search.")
-+
-+ IF(LAPACKE_ROOT)
-+ #find libs
-+ FIND_LIBRARY(
-+ LAPACKE_LIB
-+ NAMES "lapacke" "LAPACKE" "liblapacke"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "lib" "lib64"
-+ DOC "LAPACKE Library"
-+ NO_DEFAULT_PATH
-+ )
-+ FIND_LIBRARY(
-+ LAPACK_LIB
-+ NAMES "lapack" "LAPACK" "liblapack"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "lib" "lib64"
-+ DOC "LAPACK Library"
-+ NO_DEFAULT_PATH
-+ )
-+ FIND_PATH(
-+ LAPACKE_INCLUDES
-+ NAMES "lapacke.h"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "include"
-+ DOC "LAPACKE Include Directory"
-+ NO_DEFAULT_PATH
-+ )
-+
-+ ELSE()
-+ FIND_LIBRARY(
-+ LAPACKE_LIB
-+ NAMES "lapacke" "liblapacke"
-+ PATHS
-+ ${PC_LAPACKE_LIBRARY_DIRS}
-+ ${LIB_INSTALL_DIR}
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib64
-+ /usr/local/lib
-+ /sw/lib
-+ /opt/local/lib
-+ DOC "LAPACKE Library"
-+ )
-+ FIND_LIBRARY(
-+ LAPACK_LIB
-+ NAMES "lapack" "liblapack"
-+ PATHS
-+ ${PC_LAPACKE_LIBRARY_DIRS}
-+ ${LIB_INSTALL_DIR}
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib64
-+ /usr/local/lib
-+ /sw/lib
-+ /opt/local/lib
-+ DOC "LAPACK Library"
-+ )
-+ FIND_PATH(
-+ LAPACKE_INCLUDES
-+ NAMES "lapacke.h"
-+ PATHS
-+ ${PC_LAPACKE_INCLUDE_DIRS}
-+ ${INCLUDE_INSTALL_DIR}
-+ /usr/include
-+ /usr/local/include
-+ /sw/include
-+ /opt/local/include
-+ DOC "LAPACKE Include Directory"
-+ )
-+ ENDIF(LAPACKE_ROOT)
-+ENDIF(PC_LAPACKE_FOUND)
-
- SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})
- SET(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDES})
---
-2.4.6
-
