[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/files/, sci-libs/blas-reference/
commit: 4506b053a4bd57ec14553db2375eb853dd819ae6
Author: Matthias Maier gentoo org>
AuthorDate: Fri Feb 3 02:39:51 2017 +
Commit: Marius Brehler linux sungazer de>
CommitDate: Fri Feb 3 02:39:51 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4506b053
sci-libs/blas-reference: version bump to 20161223 (3.7.0)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../blas-reference-20161223-r100.ebuild| 111 +
.../lapack-reference-3.7.0-fix-build-system.patch | 56 +++
2 files changed, 167 insertions(+)
diff --git a/sci-libs/blas-reference/blas-reference-20161223-r100.ebuild
b/sci-libs/blas-reference/blas-reference-20161223-r100.ebuild
new file mode 100644
index 000..3b6165c
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20161223-r100.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="refblas"
+
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild
python-any-r1 toolchain-funcs
+
+LPN=lapack
+LPV=3.7.0
+
+DESCRIPTION="Reference implementation of BLAS"
+HOMEPAGE="http://www.netlib.org/lapack/;
+SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz;
+
+LICENSE="BSD"
+SLOT="0/${LPV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? ( ${PYTHON_DEPS} )
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${LPN}-${LPV}"
+PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
+
+src_prepare() {
+ default
+
+ # rename library to avoid collision with other blas implementations
+ # ${LIBNAME} and ${PROFNAME} are not defined here, they are in single
+ # quotes in the following seds. They are later set by defining cmake
+ # variables with -DPROFNAME etc in src_configure
+ sed -i \
+ -e 's:\([^xc]\)blas:\1${LIBNAME}:g' \
+ -e '/PROPERTIES/s:blas:${LIBNAME}:g' \
+ CMakeLists.txt \
+ BLAS/SRC/CMakeLists.txt || die
+ sed -i \
+ -e '/Name: /s:blas:@PROFNAME@:' \
+ -e 's:-lblas:-l@LIBNAME@:g' \
+BLAS/blas.pc.in || die
+ sed -i \
+ -e 's:blas):${LIBNAME}):' \
+ BLAS/TESTING/CMakeLists.txt || die
+ sed -i \
+ -e 's:BINARY_DIR}/blas:BINARY_DIR}/${PROFNAME}:' \
+ BLAS/CMakeLists.txt || die
+}
+
+src_configure() {
+ blas_configure() {
+ local FCFLAGS="${FCFLAGS}"
+ append-fflags $($(tc-getPKG_CONFIG) --cflags ${blas_profname})
+ append-fflags $(get_abi_CFLAGS)
+ append-fflags $(numeric-int64_get_fortran_int64_abi_fflags)
+
+ local profname=$(numeric-int64_get_module_name)
+ local libname="${profname//-/_}"
+
+ local mycmakeargs=(
+ -Wno-dev
+ -DPROFNAME="${profname}"
+ -DLIBNAME="${libname}"
+ -DUSE_OPTIMIZED_BLAS=OFF
+ -DCMAKE_Fortran_FLAGS="${FCFLAGS}"
+
-DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
+ -DBUILD_TESTING="$(usex test)"
+ )
+ if $(numeric-int64_is_static_build); then
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_STATIC_LIBS=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS=OFF
+ )
+ fi
+ cmake-utils_src_configure
+ }
+ numeric-int64-multibuild_foreach_all_abi_variants blas_configure
+}
+
+src_compile() {
+ local each target_dirs=( BLAS )
+ use test && target_dirs+=( TESTING )
+ for each in ${target_dirs[@]}; do
+ numeric-int64-multibuild_foreach_all_abi_variants \
+ cmake-utils_src_compile -C ${each}
+ done
+
+}
+
+src_test() {
+ numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_test
+}
+
+src_install() {
+ numeric-int64-multibuild_foreach_all_abi_variants
cmake-utils_src_install -C BLAS
+ numeric-int64-multibuild_install_alternative blas reference
+}
diff --git
a/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
b/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
new file mode 100644
index 000..70f7cb0
--- /dev/null
+++
b/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
@@ -0,0 +1,56 @@
+diff --git a/BLAS/blas.pc.in
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/files/, sci-libs/blas-reference/
commit: 3ffcac2a5a87d307207a3e9a0ff1e571ade6593d
Author: Ted Tanberry gmail com>
AuthorDate: Wed Dec 2 19:25:42 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Wed Dec 2 19:25:42 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3ffcac2a
sci-libs/blas-reference: update pkg-config handling
.../blas-reference/blas-reference-20151113.ebuild | 11 ++-
.../files/lapack-fix-build-system.patch| 92 ++
2 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild
b/sci-libs/blas-reference/blas-reference-20151113.ebuild
index e997988..d1d70b4 100644
--- a/sci-libs/blas-reference/blas-reference-20151113.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20151113.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
NUMERIC_MODULE_NAME="refblas"
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1 toolchain-funcs
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1 toolchain-funcs eutils
LPN=lapack
LPV=3.6.0
@@ -30,8 +30,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${LPN}-${LPV}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
src_prepare() {
+ # the lapack(e)/(c)blas build system is somewhat broken
+ # with respect to its pkg-config files.
+ epatch "${PATCHES[@]}"
+
# rename library to avoid collision with other blas implementations
# ${LIBNAME} and ${PROFNAME} are not defined here, they are in single
# quotes in the following seds. They are later set by defining cmake
@@ -42,8 +47,8 @@ src_prepare() {
CMakeLists.txt \
BLAS/SRC/CMakeLists.txt || die
sed -i \
- -e '/Name: /s:blas:${PROFNAME}:' \
- -e 's:-lblas:-l${LIBNAME}:g' \
+ -e '/Name: /s:blas:@PROFNAME@:' \
+ -e 's:-lblas:-l@LIBNAME@:g' \
BLAS/blas.pc.in || die
sed -i \
-e 's:blas):${LIBNAME}):' \
diff --git a/sci-libs/blas-reference/files/lapack-fix-build-system.patch
b/sci-libs/blas-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 000..8661709
--- /dev/null
+++ b/sci-libs/blas-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
lapack-3.6.0/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
lapack-3.6.0/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
lapack-3.6.0/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/files/, sci-libs/blas-reference/
commit: c399d0d8c9e0bb0cb8c33ad44cf735848bc14b35
Author: Ted Tanberry gmail com>
AuthorDate: Wed Dec 2 19:25:42 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Dec 3 09:42:20 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c399d0d8
sci-libs/blas-reference: update pkg-config handling
.../blas-reference/blas-reference-20151113.ebuild | 11 ++-
.../files/lapack-fix-build-system.patch| 92 ++
2 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild
b/sci-libs/blas-reference/blas-reference-20151113.ebuild
index e997988..d1d70b4 100644
--- a/sci-libs/blas-reference/blas-reference-20151113.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20151113.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
NUMERIC_MODULE_NAME="refblas"
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1 toolchain-funcs
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1 toolchain-funcs eutils
LPN=lapack
LPV=3.6.0
@@ -30,8 +30,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${LPN}-${LPV}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
src_prepare() {
+ # the lapack(e)/(c)blas build system is somewhat broken
+ # with respect to its pkg-config files.
+ epatch "${PATCHES[@]}"
+
# rename library to avoid collision with other blas implementations
# ${LIBNAME} and ${PROFNAME} are not defined here, they are in single
# quotes in the following seds. They are later set by defining cmake
@@ -42,8 +47,8 @@ src_prepare() {
CMakeLists.txt \
BLAS/SRC/CMakeLists.txt || die
sed -i \
- -e '/Name: /s:blas:${PROFNAME}:' \
- -e 's:-lblas:-l${LIBNAME}:g' \
+ -e '/Name: /s:blas:@PROFNAME@:' \
+ -e 's:-lblas:-l@LIBNAME@:g' \
BLAS/blas.pc.in || die
sed -i \
-e 's:blas):${LIBNAME}):' \
diff --git a/sci-libs/blas-reference/files/lapack-fix-build-system.patch
b/sci-libs/blas-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 000..8661709
--- /dev/null
+++ b/sci-libs/blas-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
lapack-3.6.0/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
lapack-3.6.0/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
lapack-3.6.0/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
