[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: 4b32011a72001b46fb34ebb04dcc2bee0fa295f0 Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 21 19:12:51 2018 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 21 19:12:51 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4b32011a sci-libs/blas-reference: Run cmake-utils_src_prepare Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/blas-reference/blas-reference-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-libs/blas-reference/blas-reference-.ebuild b/sci-libs/blas-reference/blas-reference-.ebuild index 12e50de88..71b81ca97 100644 --- a/sci-libs/blas-reference/blas-reference-.ebuild +++ b/sci-libs/blas-reference/blas-reference-.ebuild @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${LPN}-${LPV}" src_prepare() { + cmake-utils_src_prepare # 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
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: c652be510dabd08a202e0c96ec0647b01133db5d Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 21 18:56:14 2018 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 21 18:56:14 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c652be51 sci-libs/blas-reference: Version Bump Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../blas-reference-20171112-r100.ebuild| 109 + 1 file changed, 109 insertions(+) diff --git a/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild b/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild new file mode 100644 index 0..9ed341c06 --- /dev/null +++ b/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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.8.0 + +DESCRIPTION="Reference implementation of BLAS" +HOMEPAGE="http://www.netlib.org/lapack/; +SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tar.gz; + +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}" + +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 +}
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: ebed5ad81567b39f170ed4bd47972bf3928d4653 Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 21 18:51:44 2018 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 21 18:51:44 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ebed5ad8 sci-libs/blas-reference: Clean old Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../blas-reference-20131116-r100.ebuild| 106 --- .../blas-reference-20151113-r100.ebuild| 112 - .../blas-reference/blas-reference-.ebuild | 6 +- 3 files changed, 3 insertions(+), 221 deletions(-) diff --git a/sci-libs/blas-reference/blas-reference-20131116-r100.ebuild b/sci-libs/blas-reference/blas-reference-20131116-r100.ebuild deleted file mode 100644 index 7927c9503..0 --- a/sci-libs/blas-reference/blas-reference-20131116-r100.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -NUMERIC_MODULE_NAME="refblas" - -inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs - -LPN=lapack -LPV=3.5.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}" - -src_prepare() { - # 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' \ - 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)" - $(cmake-utils_use_build test TESTING) - ) - 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/blas-reference-20151113-r100.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r100.ebuild deleted file mode 100644 index de7d0e668..0 --- a/sci-libs/blas-reference/blas-reference-20151113-r100.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: d4e0b24332115287401bb5b5715cc5c7c3ee1a65 Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 21 19:04:42 2018 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 21 19:04:42 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4e0b243 sci-libs/blas-reference: Run cmake-utils_src_prepare Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/blas-reference/blas-reference-20171112-r100.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild b/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild index 9ed341c06..72bcfd5f3 100644 --- a/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild +++ b/sci-libs/blas-reference/blas-reference-20171112-r100.ebuild @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${LPN}-${LPV}" src_prepare() { - default + cmake-utils_src_prepare # rename library to avoid collision with other blas implementations # ${LIBNAME} and ${PROFNAME} are not defined here, they are in single
[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/
commit: f4e1a2258f42c9136e8fd273012f1e6274eede67 Author: Matthias Maier gentoo org> AuthorDate: Sat Sep 24 19:50:44 2016 + Commit: Marius Brehler linux sungazer de> CommitDate: Sat Sep 24 20:10:31 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f4e1a225 sci-libs/blas-reference: revision bump to -r100 This ensures that blas-reference versions from ::science are preferred over versions from ::gentoo. Package-Manager: portage-2.2.28 ...s-reference-20131116-r2.ebuild => blas-reference-20131116-r100.ebuild} | 0 ...s-reference-20151113-r1.ebuild => blas-reference-20151113-r100.ebuild} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sci-libs/blas-reference/blas-reference-20131116-r2.ebuild b/sci-libs/blas-reference/blas-reference-20131116-r100.ebuild similarity index 100% rename from sci-libs/blas-reference/blas-reference-20131116-r2.ebuild rename to sci-libs/blas-reference/blas-reference-20131116-r100.ebuild diff --git a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r100.ebuild similarity index 100% rename from sci-libs/blas-reference/blas-reference-20151113-r1.ebuild rename to sci-libs/blas-reference/blas-reference-20151113-r100.ebuild
[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/
commit: 9dc01e8a30335cec9d8b64f11b83e8c024c40ac3 Author: Ted Tanberry gmail com> AuthorDate: Thu Dec 3 08:41:43 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Dec 3 08:41:43 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9dc01e8a sci-libs/blas-reference: revbump ...blas-reference-20151113.ebuild => blas-reference-20151113-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild similarity index 96% rename from sci-libs/blas-reference/blas-reference-20151113.ebuild rename to sci-libs/blas-reference/blas-reference-20151113-r1.ebuild index d1d70b4..7f75f7a 100644 --- a/sci-libs/blas-reference/blas-reference-20151113.ebuild +++ b/sci-libs/blas-reference/blas-reference-20151113-r1.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 eutils +inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs LPN=lapack LPV=3.6.0
[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@
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: 5cddcc48d6ed19c10b32364e60898178ae9a0ba8 Author: Ted Tanberry gmail com> AuthorDate: Thu Dec 3 08:41:43 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Dec 3 09:42:20 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5cddcc48 sci-libs/blas-reference: revbump ...blas-reference-20151113.ebuild => blas-reference-20151113-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild similarity index 96% rename from sci-libs/blas-reference/blas-reference-20151113.ebuild rename to sci-libs/blas-reference/blas-reference-20151113-r1.ebuild index d1d70b4..7f75f7a 100644 --- a/sci-libs/blas-reference/blas-reference-20151113.ebuild +++ b/sci-libs/blas-reference/blas-reference-20151113-r1.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 eutils +inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs LPN=lapack LPV=3.6.0
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: 1b608d75087bbb699a546dbffc63bebb9ad95177 Author: Justin Lecher gentoo org> AuthorDate: Mon Nov 30 14:41:21 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 30 14:41:21 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b608d75 sci-libs/blas-reference: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> .../blas-reference/blas-reference-20151113.ebuild | 108 + 1 file changed, 108 insertions(+) diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild b/sci-libs/blas-reference/blas-reference-20151113.ebuild new file mode 100644 index 000..bf56016 --- /dev/null +++ b/sci-libs/blas-reference/blas-reference-20151113.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +NUMERIC_MODULE_NAME="refblas" + +inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs + +LPN=lapack +LPV=3.6.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" +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}" + +src_prepare() { + # 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)" + $(cmake-utils_use_build test TESTING) + ) + 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 +}
[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/
commit: 8de2cb0e46571aec33f5a4740fbe3f314f305584 Author: Justin Lecher gentoo org> AuthorDate: Mon Nov 30 14:42:41 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 30 14:42:41 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8de2cb0e sci-libs/blas-reference: Set subslots Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> sci-libs/blas-reference/blas-reference-20131116-r2.ebuild | 2 +- sci-libs/blas-reference/blas-reference-20151113.ebuild| 2 +- sci-libs/blas-reference/blas-reference-.ebuild| 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sci-libs/blas-reference/blas-reference-20131116-r2.ebuild b/sci-libs/blas-reference/blas-reference-20131116-r2.ebuild index 3b4d976..2eaa466 100644 --- a/sci-libs/blas-reference/blas-reference-20131116-r2.ebuild +++ b/sci-libs/blas-reference/blas-reference-20131116-r2.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/; SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz; LICENSE="BSD" -SLOT="0" +SLOT="0/${LPV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" diff --git a/sci-libs/blas-reference/blas-reference-20151113.ebuild b/sci-libs/blas-reference/blas-reference-20151113.ebuild index bf56016..e997988 100644 --- a/sci-libs/blas-reference/blas-reference-20151113.ebuild +++ b/sci-libs/blas-reference/blas-reference-20151113.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/; SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz; LICENSE="BSD" -SLOT="0" +SLOT="0/${LPV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" diff --git a/sci-libs/blas-reference/blas-reference-.ebuild b/sci-libs/blas-reference/blas-reference-.ebuild index b079855..d26bbee 100644 --- a/sci-libs/blas-reference/blas-reference-.ebuild +++ b/sci-libs/blas-reference/blas-reference-.ebuild @@ -11,14 +11,14 @@ NUMERIC_MODULE_NAME="refblas" inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs subversion LPN=lapack -LPV=3.5.0 +LPV=3.6.0 DESCRIPTION="Reference implementation of BLAS" HOMEPAGE="http://www.netlib.org/lapack/; ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/${LPN}/trunk; LICENSE="BSD" -SLOT="0" +SLOT="0/${LPV}" KEYWORDS="" IUSE="static-libs test" @@ -28,7 +28,6 @@ RDEPEND="" DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) virtual/pkgconfig" -PDEPEND=">=virtual/blas-2.1-r3[int64?]" S="${WORKDIR}/${LPN}-${LPV}" @@ -39,6 +38,7 @@ src_prepare() { # 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 \