* [gentoo-commits] repo/gentoo:master commit in: sci-libs/clapack/, sci-libs/clapack/files/
@ 2017-01-29 9:26 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2017-01-29 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 97cd40a0e43816fb6a6af0e5bc55769f6d459145
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 09:25:40 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 09:25:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97cd40a0
sci-libs/clapack: Remove 3.2.1 (r7)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/clapack/clapack-3.2.1-r7.ebuild | 41 ------------------
.../clapack/files/clapack-3.2.1-findblas.patch | 49 ----------------------
2 files changed, 90 deletions(-)
diff --git a/sci-libs/clapack/clapack-3.2.1-r7.ebuild b/sci-libs/clapack/clapack-3.2.1-r7.ebuild
deleted file mode 100644
index 4004c07..00000000
--- a/sci-libs/clapack/clapack-3.2.1-r7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="f2c'ed version of LAPACK"
-HOMEPAGE="http://www.netlib.org/clapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/libf2c-20090407-r1
- virtual/blas"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-CMAKE
-
-PATCHES=(
- "${FILESDIR}/${P}-fix_include_file.patch"
- "${FILESDIR}/${P}-noblasf2c.patch"
- "${FILESDIR}/${P}-hang.patch"
- "${FILESDIR}/${P}-findblas-r7.patch"
-)
-
-# bug 433806
-RESTRICT="test"
-
-src_configure() {
- filter-flags -ftree-vectorize
- # causes an internal compiler error with gcc-4.6.2
-
- local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas.patch b/sci-libs/clapack/files/clapack-3.2.1-findblas.patch
deleted file mode 100644
index e2744f8..00000000
--- a/sci-libs/clapack/files/clapack-3.2.1-findblas.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt
---- clapack-3.2.1-CMAKE.orig/CMakeLists.txt 2011-06-17 23:01:05.275747599 +0200
-+++ clapack-3.2.1-CMAKE/CMakeLists.txt 2011-06-17 23:07:49.128747755 +0200
-@@ -30,6 +30,28 @@
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-
-+if(BLAS_LIBRARIES)
-+ include(CheckFortranFunctionExists)
-+ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
-+ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
-+ unset( CMAKE_REQUIRED_LIBRARIES )
-+ if(BLAS_FOUND)
-+ message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
-+ else(BLAS_FOUND)
-+ message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
-+ message(ERROR "--> Will use REFERENCE BLAS (by default)")
-+ message(ERROR "--> Or Correct your BLAS_LIBRARIES entry ")
-+ message(ERROR "--> Or Consider checking USE_OPTIMIZED_BLAS")
-+ endif(BLAS_FOUND)
-+else(BLAS_LIBRARIES)
-+ # User did not provide a BLAS Library
-+ find_package( BLAS )
-+endif (BLAS_LIBRARIES)
-+
-+if(NOT BLAS_FOUND)
-+ message(FATAL_ERROR "--> BLAS libraries needed but not found.")
-+endif(NOT BLAS_FOUND)
-+
- add_subdirectory(SRC)
-
- if(ENABLE_TESTS)
-@@ -44,4 +66,3 @@
- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
- configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
--
-diff -ruN clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt
---- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt 2011-06-17 23:01:05.276747599 +0200
-+++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2011-06-17 23:08:43.761747789 +0200
-@@ -377,7 +377,7 @@
- endif()
-
- add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
--target_link_libraries(clapack blas f2c m)
-+target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m)
- set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
-
- install(
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/clapack/, sci-libs/clapack/files/
@ 2017-01-31 20:22 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2017-01-31 20:22 UTC (permalink / raw
To: gentoo-commits
commit: afc99f9524accd18a522c3ff47a40472a79d25b6
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 20:22:11 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 20:22:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc99f95
sci-libs/clapack: Remove 3.2.1-r6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/clapack/clapack-3.2.1-r6.ebuild | 41 ------------------
.../clapack/files/clapack-3.2.1-findblas-r6.patch | 50 ----------------------
2 files changed, 91 deletions(-)
diff --git a/sci-libs/clapack/clapack-3.2.1-r6.ebuild b/sci-libs/clapack/clapack-3.2.1-r6.ebuild
deleted file mode 100644
index 57fb494..00000000
--- a/sci-libs/clapack/clapack-3.2.1-r6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="f2c'ed version of LAPACK"
-HOMEPAGE="http://www.netlib.org/clapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/libf2c-20090407-r1
- virtual/blas"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-CMAKE
-
-PATCHES=(
- "${FILESDIR}/${P}-fix_include_file.patch"
- "${FILESDIR}/${P}-noblasf2c.patch"
- "${FILESDIR}/${P}-hang.patch"
- "${FILESDIR}/${P}-findblas-r6.patch"
-)
-
-# bug 433806
-RESTRICT="test"
-
-src_configure() {
- filter-flags -ftree-vectorize
- # causes an internal compiler error with gcc-4.6.2
-
- local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch b/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch
deleted file mode 100644
index 028dec6..00000000
--- a/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt
---- clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt 2011-06-19 22:13:27.000000000 +0200
-+++ clapack-3.2.1-CMAKE/CMakeLists.txt 2011-06-19 22:23:14.000000000 +0200
-@@ -30,6 +30,29 @@
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-
-+if(BLAS_LIBRARIES)
-+ include(CheckFortranFunctionExists)
-+ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
-+ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
-+ unset( CMAKE_REQUIRED_LIBRARIES )
-+ if(BLAS_FOUND)
-+ message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
-+ else(BLAS_FOUND)
-+ message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
-+ message(ERROR "--> Will use REFERENCE BLAS (by default)")
-+ message(ERROR "--> Or Correct your BLAS_LIBRARIES entry ")
-+ message(ERROR "--> Or Consider checking USE_OPTIMIZED_BLAS")
-+ endif(BLAS_FOUND)
-+else(BLAS_LIBRARIES)
-+ # User did not provide a BLAS Library
-+ find_package(PkgConfig)
-+ pkg_check_modules(BLAS blas)
-+endif (BLAS_LIBRARIES)
-+
-+if(NOT BLAS_FOUND)
-+ message(FATAL_ERROR "--> BLAS libraries needed but not found.")
-+endif(NOT BLAS_FOUND)
-+
- add_subdirectory(SRC)
-
- if(ENABLE_TESTS)
-@@ -44,4 +67,3 @@
- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
- configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
--
-diff -ruN clapack-3.2.1-CMAKE.1.allexfb/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt
---- clapack-3.2.1-CMAKE.1.allexfb/SRC/CMakeLists.txt 2011-06-19 22:13:44.000000000 +0200
-+++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2011-06-19 22:15:04.000000000 +0200
-@@ -380,7 +380,7 @@
- endif()
-
- add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
--target_link_libraries(clapack blas f2c m)
-+target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m)
- set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
-
- install(
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-31 20:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-31 20:22 [gentoo-commits] repo/gentoo:master commit in: sci-libs/clapack/, sci-libs/clapack/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2017-01-29 9:26 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox