* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2011-08-19 15:26 Andrea Arteaga
0 siblings, 0 replies; 33+ messages in thread
From: Andrea Arteaga @ 2011-08-19 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 469b48527f1e0e0293b0450f111efb4c2d8f1860
Author: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Fri Aug 19 15:26:20 2011 +0000
Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Fri Aug 19 15:26:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=469b4852
Added svn version for lapack-reference.
---
sci-libs/lapack-reference/ChangeLog | 5 +
.../lapack-reference/lapack-reference-9999.ebuild | 86 ++++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 2c9db2e..e39d124 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.3.1 (19 Aug 2011)
+
+ 19 Aug 2011; Andrea Arteaga <andyspiros@gmail.com> +lapack-reference-9999.ebuild
+ Added svn 9999 version.
+
19 Aug 2011 Andrea Arteaga <andyspiros@gmail.com> +lapack-reference-3.3.1-r1.ebuild
+files/3.3.1-blas-libs.patch +files/3.3.1-xblas-libs.patch +Manifest +metadata.xml
Imported from bicatali overlay.
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
new file mode 100644
index 0000000..fe1fc49
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs cmake-utils alternatives-2 subversion
+
+MYP=lapack-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs test xblas"
+
+RDEPEND="virtual/blas
+ virtual/fortran
+ xblas? ( sci-libs/xblas )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+DOCS=( README )
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ # not longer needed
+ #epatch \
+ # "${FILESDIR}"/${PV}-blas-libs.patch \
+ # "${FILESDIR}"/${PV}-xblas-libs.patch
+
+ # avoid collision with other lapack
+ sed -i \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
+ -e '/export/s:lapack:reflapack:g' \
+ CMakeLists.txt || die
+ sed -i \
+ -e 's:(lapack:(reflapack:g' \
+ SRC/CMakeLists.txt || die
+ sed -i \
+ -e 's:lapack:reflapack:g' \
+ TESTING/*/CMakeLists.txt || die
+ sed -i \
+ -e 's:-llapack:-lreflapack:g' \
+ lapack.pc.in || die
+ export FC=$(tc-getFC) F77=$(tc-getF77)
+ use static-libs && mkdir "${WORKDIR}/${PN}_static"
+}
+
+lapack_configure() {
+ mycmakeargs+=(
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use xblas XBLAS)
+ )
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+ lapack_configure
+ if use static-libs; then
+ mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use static-libs; then
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use static-libs; then
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+ fi
+ alternatives_for lapack reference 0 \
+ "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-01-26 17:41 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-01-26 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 0876eccc8c2625eda199f98d4b79d4a0d3fa77eb
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Jan 26 17:41:02 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 17:41:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0876eccc
sci-libs/lapack-reference: Version bump
(Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 8 ++-
.../lapack-reference/lapack-reference-3.4.0.ebuild | 79 ++++++++++++++++++++
2 files changed, 86 insertions(+), 1 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index e39d124..2006cee 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/lapack-reference
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.4.0 (26 Jan 2012)
+
+ 26 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +lapack-reference-3.4.0.ebuild:
+ Version bump
+
*lapack-reference-3.3.1 (19 Aug 2011)
19 Aug 2011; Andrea Arteaga <andyspiros@gmail.com> +lapack-reference-9999.ebuild
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.0.ebuild
new file mode 100644
index 0000000..d7187cb
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs cmake-utils alternatives-2
+
+MYP=lapack-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test xblas"
+
+RDEPEND="virtual/blas
+ virtual/fortran
+ xblas? ( sci-libs/xblas )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ # avoid collision with other lapack
+ sed -i \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
+ -e '/export/s:lapack:reflapack:g' \
+ CMakeLists.txt || die
+ sed -i \
+ -e 's:(lapack:(reflapack:g' \
+ SRC/CMakeLists.txt || die
+ sed -i \
+ -e 's:lapack:reflapack:g' \
+ TESTING/*/CMakeLists.txt || die
+ sed -i \
+ -e 's:-llapack:-lreflapack:g' \
+ lapack.pc.in || die
+ export FC=$(tc-getFC) F77=$(tc-getF77)
+ use static-libs && mkdir "${WORKDIR}/${PN}_static"
+}
+
+lapack_configure() {
+ mycmakeargs+=(
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use xblas XBLAS)
+ )
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+ lapack_configure
+ if use static-libs; then
+ mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use static-libs; then
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use static-libs; then
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+ fi
+ alternatives_for lapack reference 0 \
+ "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-02-16 0:38 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-02-16 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 665c3769ae3df8b515dfb3abf2965e1ae52de52b
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 00:35:32 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 00:35:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=665c3769
sci-libs/lapack-reference: bump, with home patches
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 6 ++
.../lapack-reference-3.4.0_p20120215.ebuild | 62 ++++++++++++++++++++
2 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 2006cee..745a6ae 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.4.0_p20120215 (16 Feb 2012)
+
+ 16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +lapack-reference-3.4.0_p20120215.ebuild:
+ bump, with home patches
+
*lapack-reference-3.4.0 (26 Jan 2012)
26 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215.ebuild
new file mode 100644
index 0000000..184a7d2
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils fortran-2 cmake-utils alternatives-2
+
+MYP=lapack-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+#SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${MYP}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test xblas"
+
+RDEPEND="virtual/blas
+ virtual/fortran
+ xblas? ( sci-libs/xblas )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ use static-libs && mkdir "${WORKDIR}/${PN}_static"
+}
+
+src_configure() {
+ lapack_configure() {
+ local mycmakeargs=(
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_use xblas XBLAS)
+ $@
+ )
+ cmake-utils_src_configure
+ }
+
+ lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
+ -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+ alternatives_for lapack reference 0 \
+ "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-02-17 16:26 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-02-17 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 71cbf83aaa763945ebd29f7e117ded7fe9539548
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Feb 17 16:24:28 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 16:24:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=71cbf83a
sci-libs/lapack-reference: Fixed pkg-config
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 7 +++++++
... => lapack-reference-3.4.0_p20120215-r1.ebuild} | 0
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 745a6ae..41b4892 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.4.0_p20120215-r1 (17 Feb 2012)
+
+ 17 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ -lapack-reference-3.4.0_p20120215.ebuild,
+ +lapack-reference-3.4.0_p20120215-r1.ebuild:
+ Fixed pkg-config
+
*lapack-reference-3.4.0_p20120215 (16 Feb 2012)
16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
similarity index 100%
rename from sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-02-23 9:18 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-02-23 9:18 UTC (permalink / raw
To: gentoo-commits
commit: fac09faebce9c1ff994c82110a4ba43be0f03298
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 09:17:18 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 09:17:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fac09fae
Keyworded for ~-linux prefix
(Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 8 ++++++++
.../lapack-reference-3.4.0_p20120215-r1.ebuild | 2 +-
sci-libs/lapack-reference/metadata.xml | 10 +++++-----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 41b4892..3ea64cd 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 23 Feb 2012; Justin Lecher <jlec@gentoo.org>
+ lapack-reference-3.4.0_p20120215-r1.ebuild, metadata.xml:
+ Keyworded for ~-linux prefix
+
+ 23 Feb 2012; Justin Lecher <jlec@gentoo.org>
+ lapack-reference-3.4.0_p20120215-r1.ebuild, metadata.xml:
+ Keyworded for ~-linux prefix
+
*lapack-reference-3.4.0_p20120215-r1 (17 Feb 2012)
17 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
index 184a7d2..797a518 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${MYP}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs test xblas"
RDEPEND="virtual/blas
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 5cece89..26a4f9f 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Linear Algebra PACKage (LAPACK) is a comprehensive library that
does linear algebra operations including matrix inversions, least
squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,7 +12,7 @@
Netlib for LAPACK and optionnally the one for the Basic Linear
Algebra Subprogram (BLAS).
</longdescription>
-<use>
- <flag name='xblas'>Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag>
-</use>
+ <use>
+ <flag name="xblas">Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-04-25 6:47 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-04-25 6:47 UTC (permalink / raw
To: gentoo-commits
commit: f54efde81d0f414f3a5405248f5fc3c9baca3515
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 06:47:01 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 06:47:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f54efde8
sci-libs/lapack-reference: Fix manifest
(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 3 +++
.../lapack-reference/lapack-reference-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index ac26cae..036ac12 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 25 Apr 2012; Justin Lecher <jlec@gentoo.org> lapack-reference-9999.ebuild:
+ Fix manifest
+
*lapack-reference-3.4.1 (23 Apr 2012)
23 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index fe1fc49..535191d 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -31,7 +31,7 @@ src_prepare() {
#epatch \
# "${FILESDIR}"/${PV}-blas-libs.patch \
# "${FILESDIR}"/${PV}-xblas-libs.patch
-
+
# avoid collision with other lapack
sed -i \
-e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-04-25 15:10 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-04-25 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 6cc4033732a1c355c36f31c4b8dc0fd8ea96d068
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 24 05:51:14 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 05:51:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6cc40337
sci-libs/lapack-reference: Clean checksums
(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/lapack-reference/ChangeLog | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index ac26cae..200f273 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 24 Apr 2012; Justin Lecher <jlec@gentoo.org> Manifest:
+ Clean checksums
+
*lapack-reference-3.4.1 (23 Apr 2012)
23 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-10-26 16:53 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-10-26 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 2d3eb84ba606d2d92e8ddd23d23579bd36db6ff6
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 16:34:10 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 16:34:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2d3eb84b
sci-libs/lapack-reference: Version bump. Restore the reflapack library name instead of lapack
Package-Manager: portage-2.2.0_alpha141
---
sci-libs/lapack-reference/ChangeLog | 7 ++
.../lapack-reference/lapack-reference-3.4.2.ebuild | 74 ++++++++++++++++++++
2 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 7a860e5..9b54791 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.4.2 (26 Oct 2012)
+
+ 26 Oct 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +lapack-reference-3.4.2.ebuild:
+ sci-libs/lapack-reference: Version bump. Restore the reflapack library name
+ instead of lapack
+
25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
-files/3.4.1-cmake.patch, lapack-reference-3.4.1.ebuild,
+files/lapack-3.4.1-cmake.patch:
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
new file mode 100644
index 0000000..0ce4f00
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs
+
+MYP=lapack-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test xblas"
+
+RDEPEND="virtual/blas
+ virtual/fortran
+ xblas? ( sci-libs/xblas )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ # avoid collision with other lapack
+ sed -i \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
+ -e '/export/s:lapack:reflapack:g' \
+ -e '/ALL_TARGETS/s:lapack):reflapack):' \
+ -e '/LAPACK_LIBRARIES/s:lapack:reflapack:g' \
+ CMakeLists.txt || die
+ sed -i \
+ -e 's:(lapack:(reflapack:g' \
+ SRC/CMakeLists.txt || die
+ sed -i \
+ -e 's:-llapack:-lreflapack:g' \
+ lapack.pc.in || die
+ use static-libs && mkdir "${WORKDIR}/${PN}_static"
+}
+
+src_configure() {
+ lapack_configure() {
+ local mycmakeargs=(
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_use xblas XBLAS)
+ $@
+ )
+ cmake-utils_src_configure
+ }
+
+ lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
+ -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+ alternatives_for lapack reference 0 \
+ "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-11-29 0:06 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-11-29 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 419f18c33845aea0bfefee7832aecd29317fee8d
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 23:26:00 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 23:26:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=419f18c3
sci-libs/lapack-reference: removed tmg flag, now separate ebuild
Package-Manager: portage-2.2.01.21313-prefix
---
sci-libs/lapack-reference/ChangeLog | 4 ++++
.../lapack-reference/lapack-reference-3.4.2.ebuild | 6 +++---
sci-libs/lapack-reference/metadata.xml | 1 -
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index ee7ff26..a610e3c 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ lapack-reference-3.4.2.ebuild, metadata.xml:
+ sci-libs/lapack-reference: removed tmg flag, now separate ebuild
+
28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
sci-libs/lapack-reference: tmg flag description
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
index 17d5bb6..f626710 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test tmg xblas"
+IUSE="static-libs test xblas"
RDEPEND="
virtual/blas
@@ -41,7 +41,8 @@ src_prepare() {
use static-libs && mkdir "${WORKDIR}/${PN}_static"
# some string does not get pass properly
sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die
- use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
+ # separate ebuild
+ sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
}
src_configure() {
@@ -50,7 +51,6 @@ src_configure() {
-DUSE_OPTIMIZED_BLAS=ON
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
$(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_build tmg TESTING)
$(cmake-utils_use_use xblas XBLAS)
$@
)
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index fcab15e..d769a14 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -15,6 +15,5 @@
<use>
<flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
- <flag name="tmg">Build the Test Matrix Generator library for lapack</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-11-29 0:06 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-11-29 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 58e05fffc7f2dc1f61838033dc66d5b7f5df92b7
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 22:20:50 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 22:20:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58e05fff
sci-libs/lapack-reference: tmg flag description
Package-Manager: portage-2.2.01.21313-prefix
---
sci-libs/lapack-reference/ChangeLog | 3 +++
sci-libs/lapack-reference/metadata.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 45fcb51..ee7ff26 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
+ sci-libs/lapack-reference: tmg flag description
+
28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
-lapack-reference-3.3.1-r1.ebuild, -lapack-reference-3.4.1.ebuild,
lapack-reference-3.4.2.ebuild, lapack-reference-9999.ebuild, metadata.xml:
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 62602d0..fcab15e 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -15,6 +15,6 @@
<use>
<flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
- <flag name="xblas">Build the Test Matrix Generator library for lapack</flag>
+ <flag name="tmg">Build the Test Matrix Generator library for lapack</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2012-11-29 0:06 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2012-11-29 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 391d202b48d9344378b149c0769a2d657d09efef
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 22:20:01 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 22:20:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=391d202b
sci-libs/lapack-reference: Added tmg use flag, fix a failing post command test
Package-Manager: portage-2.2.01.21313-prefix
---
sci-libs/lapack-reference/ChangeLog | 5 +
.../lapack-reference-3.3.1-r1.ebuild | 84 --------------------
.../lapack-reference/lapack-reference-3.4.1.ebuild | 62 --------------
.../lapack-reference/lapack-reference-3.4.2.ebuild | 10 ++-
.../lapack-reference/lapack-reference-9999.ebuild | 64 +++++++---------
sci-libs/lapack-reference/metadata.xml | 12 ++-
6 files changed, 47 insertions(+), 190 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 9b54791..45fcb51 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ -lapack-reference-3.3.1-r1.ebuild, -lapack-reference-3.4.1.ebuild,
+ lapack-reference-3.4.2.ebuild, lapack-reference-9999.ebuild, metadata.xml:
+ sci-libs/lapack-reference: Added tmg use flag, fix a failing post command test
+
*lapack-reference-3.4.2 (26 Oct 2012)
26 Oct 2012; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild
deleted file mode 100644
index 13e05e0..0000000
--- a/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs cmake-utils alternatives-2
-
-MYP=lapack-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test xblas"
-
-RDEPEND="virtual/blas
- virtual/fortran
- xblas? ( sci-libs/xblas )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-DOCS=( README )
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-blas-libs.patch \
- "${FILESDIR}"/${PV}-xblas-libs.patch
- # avoid collision with other lapack
- sed -i \
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
- -e '/export/s:lapack:reflapack:g' \
- CMakeLists.txt || die
- sed -i \
- -e 's:(lapack:(reflapack:g' \
- SRC/CMakeLists.txt || die
- sed -i \
- -e 's:lapack:reflapack:g' \
- TESTING/*/CMakeLists.txt || die
- sed -i \
- -e 's:-llapack:-lreflapack:g' \
- lapack.pc.in || die
- export FC=$(tc-getFC) F77=$(tc-getF77)
- use static-libs && mkdir "${WORKDIR}/${PN}_static"
-}
-
-lapack_configure() {
- mycmakeargs+=(
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use xblas XBLAS)
- )
- cmake-utils_src_configure
-}
-
-src_configure() {
- mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
- lapack_configure
- if use static-libs; then
- mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use static-libs; then
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- if use static-libs; then
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
- fi
- alternatives_for lapack reference 0 \
- "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
deleted file mode 100644
index 0e40a1a..0000000
--- a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs
-
-MYP=lapack-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
-
-RDEPEND="virtual/blas
- virtual/fortran
- xblas? ( sci-libs/xblas )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${MYP}-cmake.patch
- use static-libs && mkdir "${WORKDIR}/${PN}_static"
-}
-
-src_configure() {
- lapack_configure() {
- local mycmakeargs=(
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_use xblas XBLAS)
- $@
- )
- cmake-utils_src_configure
- }
-
- lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
- -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
-}
-
-src_compile() {
- cmake-utils_src_compile
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
- alternatives_for lapack reference 0 \
- "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
index 0ce4f00..17d5bb6 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild
@@ -14,10 +14,10 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
+IUSE="static-libs test tmg xblas"
-RDEPEND="virtual/blas
- virtual/fortran
+RDEPEND="
+ virtual/blas
xblas? ( sci-libs/xblas )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -39,6 +39,9 @@ src_prepare() {
-e 's:-llapack:-lreflapack:g' \
lapack.pc.in || die
use static-libs && mkdir "${WORKDIR}/${PN}_static"
+ # some string does not get pass properly
+ sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die
+ use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
}
src_configure() {
@@ -47,6 +50,7 @@ src_configure() {
-DUSE_OPTIMIZED_BLAS=ON
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
$(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_build tmg TESTING)
$(cmake-utils_use_use xblas XBLAS)
$@
)
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 535191d..2dcc485 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit eutils toolchain-funcs cmake-utils alternatives-2 subversion
+inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs subversion
MYP=lapack-${PV}
@@ -14,73 +14,65 @@ ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="static-libs test xblas"
+IUSE="static-libs test tmg xblas"
-RDEPEND="virtual/blas
- virtual/fortran
+RDEPEND="
+ virtual/blas
xblas? ( sci-libs/xblas )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-DOCS=( README )
+ virtual/pkgconfig"
S="${WORKDIR}/${MYP}"
src_prepare() {
- # not longer needed
- #epatch \
- # "${FILESDIR}"/${PV}-blas-libs.patch \
- # "${FILESDIR}"/${PV}-xblas-libs.patch
-
# avoid collision with other lapack
sed -i \
-e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
-e '/export/s:lapack:reflapack:g' \
+ -e '/ALL_TARGETS/s:lapack):reflapack):' \
+ -e '/LAPACK_LIBRARIES/s:lapack:reflapack:g' \
CMakeLists.txt || die
sed -i \
-e 's:(lapack:(reflapack:g' \
SRC/CMakeLists.txt || die
sed -i \
- -e 's:lapack:reflapack:g' \
- TESTING/*/CMakeLists.txt || die
- sed -i \
-e 's:-llapack:-lreflapack:g' \
lapack.pc.in || die
- export FC=$(tc-getFC) F77=$(tc-getF77)
use static-libs && mkdir "${WORKDIR}/${PN}_static"
-}
-
-lapack_configure() {
- mycmakeargs+=(
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use xblas XBLAS)
- )
- cmake-utils_src_configure
+ # some string does not get pass properly
+ sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die
+ use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
}
src_configure() {
- mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
- lapack_configure
- if use static-libs; then
- mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure
- fi
+ lapack_configure() {
+ local mycmakeargs=(
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_build tmg TESTING)
+ $(cmake-utils_use_use xblas XBLAS)
+ $@
+ )
+ cmake-utils_src_configure
+ }
+
+ lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+ use static-libs && \
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
+ -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
}
src_compile() {
cmake-utils_src_compile
- if use static-libs; then
+ use static-libs && \
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
- fi
}
src_install() {
cmake-utils_src_install
- if use static-libs; then
+ use static-libs && \
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
- fi
alternatives_for lapack reference 0 \
"/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
}
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 26a4f9f..62602d0 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
The Linear Algebra PACKage (LAPACK) is a comprehensive library that
does linear algebra operations including matrix inversions, least
squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,7 +12,9 @@
Netlib for LAPACK and optionnally the one for the Basic Linear
Algebra Subprogram (BLAS).
</longdescription>
- <use>
- <flag name="xblas">Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag>
- </use>
+<use>
+ <flag name="xblas">Build LAPACK with extra precision (needs
+ <pkg>sci-libs/xblas</pkg>)</flag>
+ <flag name="xblas">Build the Test Matrix Generator library for lapack</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2013-03-03 17:52 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-03-03 17:52 UTC (permalink / raw
To: gentoo-commits
commit: dc8b573377694edf4322cabd2dd15df13810ff73
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 17:40:37 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 17:40:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dc8b5733
sci-libs/lapack-reference: Add unocumented USE to metadata.xml
Package-Manager: portage-2.2.0_alpha164
---
sci-libs/lapack-reference/ChangeLog | 5 ++++-
sci-libs/lapack-reference/metadata.xml | 13 ++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index a610e3c..4838b92 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-libs/lapack-reference
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 03 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Add unocumented USE to metadata.xml
+
28 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
lapack-reference-3.4.2.ebuild, metadata.xml:
sci-libs/lapack-reference: removed tmg flag, now separate ebuild
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index d769a14..5413ad1 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Linear Algebra PACKage (LAPACK) is a comprehensive library that
does linear algebra operations including matrix inversions, least
squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,8 +12,11 @@
Netlib for LAPACK and optionnally the one for the Basic Linear
Algebra Subprogram (BLAS).
</longdescription>
-<use>
- <flag name="xblas">Build LAPACK with extra precision (needs
+ <use>
+ <flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
-</use>
+ </use>
+ <use>
+ <flag name="tmg">Undocumented USE</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2013-05-23 5:13 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2013-05-23 5:13 UTC (permalink / raw
To: gentoo-commits
commit: 96bda977a1b5fc1f7ab8d33c21be7994c7447c41
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 16:39:51 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed May 22 16:39:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=96bda977
sci-libs/lapack-reference: Switch to EAPI5, merge live ebuild
Package-Manager: portage-2.2.01.21938-prefix
---
sci-libs/lapack-reference/ChangeLog | 4 ++
.../lapack-reference/lapack-reference-9999.ebuild | 36 +++++++++++++------
sci-libs/lapack-reference/metadata.xml | 13 +++----
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 4838b92..22b1f9e 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 22 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ lapack-reference-9999.ebuild, metadata.xml:
+ sci-libs/lapack-reference: Switch to EAPI5, merge live ebuild
+
03 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
Add unocumented USE to metadata.xml
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 2dcc485..2fb8a3a 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -1,20 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
-inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs subversion
+EAPI=5
+inherit fortran-2 cmake-utils alternatives-2 toolchain-funcs
MYP=lapack-${PV}
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
+ inherit subversion
+ KEYWORDS=""
+else
+ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
DESCRIPTION="Reference implementation of LAPACK"
HOMEPAGE="http://www.netlib.org/lapack/"
-ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
-IUSE="static-libs test tmg xblas"
+
+IUSE="static-libs test xblas"
RDEPEND="
virtual/blas
@@ -25,7 +33,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MYP}"
src_prepare() {
- # avoid collision with other lapack
+ # rename library to avoid collision with other lapack implementations
sed -i \
-e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
-e '/export/s:lapack:reflapack:g' \
@@ -39,9 +47,14 @@ src_prepare() {
-e 's:-llapack:-lreflapack:g' \
lapack.pc.in || die
use static-libs && mkdir "${WORKDIR}/${PN}_static"
- # some string does not get pass properly
- sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die
- use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
+ # some string does not get passed properly
+ sed -i \
+ -e '/lapack_testing.py/d' \
+ CTestCustom.cmake.in || die
+ # separate ebuild to tmglib
+ sed -i \
+ -e '/lapack_install_library(tmglib)/d' \
+ TESTING/MATGEN/CMakeLists.txt || die
}
src_configure() {
@@ -50,7 +63,6 @@ src_configure() {
-DUSE_OPTIMIZED_BLAS=ON
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
$(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_build tmg TESTING)
$(cmake-utils_use_use xblas XBLAS)
$@
)
@@ -74,5 +86,5 @@ src_install() {
use static-libs && \
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
alternatives_for lapack reference 0 \
- "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+ /usr/$(get_libdir)/pkgconfig/lapack.pc reflapack.pc
}
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 5413ad1..d769a14 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
The Linear Algebra PACKage (LAPACK) is a comprehensive library that
does linear algebra operations including matrix inversions, least
squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,11 +12,8 @@
Netlib for LAPACK and optionnally the one for the Basic Linear
Algebra Subprogram (BLAS).
</longdescription>
- <use>
- <flag name="xblas">Build LAPACK with extra precision (needs
+<use>
+ <flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
- </use>
- <use>
- <flag name="tmg">Undocumented USE</flag>
- </use>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-01-28 19:01 Sebastien Fabbro
0 siblings, 0 replies; 33+ messages in thread
From: Sebastien Fabbro @ 2014-01-28 19:01 UTC (permalink / raw
To: gentoo-commits
commit: af32c31cbd2cd4872650b1d1051bf7b76cef3652
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 8 06:49:45 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 06:49:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af32c31c
sci-libs/lapack-reference: Version bump
Package-Manager: portage-2.2.7-prefix
---
sci-libs/lapack-reference/ChangeLog | 6 ++++++
sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild | 1 +
2 files changed, 7 insertions(+)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 22b1f9e..0e0a1b8 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+*lapack-reference-3.5.0 (08 Dec 2013)
+
+ 08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ +lapack-reference-3.5.0.ebuild:
+ sci-libs/lapack-reference: Version bump
+
22 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
lapack-reference-9999.ebuild, metadata.xml:
sci-libs/lapack-reference: Switch to EAPI5, merge live ebuild
diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
new file mode 120000
index 0000000..0d81fdd
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
@@ -0,0 +1 @@
+lapack-reference-9999.ebuild
\ No newline at end of file
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-09-25 10:45 Francois Bissey
0 siblings, 0 replies; 33+ messages in thread
From: Francois Bissey @ 2014-09-25 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 2448b0086ae46343357b04a54062f05f0d6d9cb3
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Sep 25 10:44:36 2014 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Sep 25 10:44:36 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2448b008
Add xblas to the .pc file when it is in use see bug#523388
Package-Manager: portage-2.2.10
---
sci-libs/lapack-reference/ChangeLog | 6 +++++-
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 6 ++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 0e0a1b8..57fcfa7 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/lapack-reference
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 25 Sep 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+ lapack-reference-9999.ebuild:
+ Add xblas to the .pc file when it is in use see bug#523388
+
*lapack-reference-3.5.0 (08 Dec 2013)
08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index cdcbe65..f9c9ca9 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -55,6 +55,12 @@ src_prepare() {
sed -i \
-e '/lapack_install_library(tmglib)/d' \
TESTING/MATGEN/CMakeLists.txt || die
+ # if xblas is used add it in the .pc file
+ if use xblas ; then
+ sed -i \
+ -e '/Requires/s:blas:blas xblas:' \
+ lapack.pc.in || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-09-25 21:21 Francois Bissey
0 siblings, 0 replies; 33+ messages in thread
From: Francois Bissey @ 2014-09-25 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 68dc06c382a117e2148005a58062afb831f23d15
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Sep 25 21:21:26 2014 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Sep 25 21:21:26 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=68dc06c3
The dependency needs to be on xblas[fortran] otherwise libxblas won't have the required fortran symbols.
Package-Manager: portage-2.2.10
---
sci-libs/lapack-reference/ChangeLog | 5 +++++
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 57fcfa7..3c1104e 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -4,6 +4,11 @@
25 Sep 2014; François Bissey <francois.bissey@canterbury.ac.nz>
lapack-reference-9999.ebuild:
+ The dependency needs to be on xblas[fortran] otherwise libxblas won't have the
+ required fortran symbols.
+
+ 25 Sep 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+ lapack-reference-9999.ebuild:
Add xblas to the .pc file when it is in use see bug#523388
*lapack-reference-3.5.0 (08 Dec 2013)
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index f9c9ca9..aca6ba0 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="static-libs test xblas"
RDEPEND="
virtual/blas
- xblas? ( sci-libs/xblas )"
+ xblas? ( sci-libs/xblas[fortran] )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-06 5:56 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-06 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 272370d6abb3eb6975e2a9fc5ba4a4a0767440b7
Author: gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:09:18 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:09:18 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=272370d6
Fix rebase lapack-multibuild to master conflict 1 on sci-libs/lapack-reference
---
sci-libs/lapack-reference/ChangeLog | 4 +
.../lapack-reference/lapack-reference-9999.ebuild | 142 +++++++++++++++++----
sci-libs/lapack-reference/metadata.xml | 1 +
3 files changed, 119 insertions(+), 28 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 3c1104e..4df9585 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,10 @@
lapack-reference-9999.ebuild:
Add xblas to the .pc file when it is in use see bug#523388
+ 18 Feb 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild,
+ metadata.xml:
+ multibuild lapack-reference when USE=int64 and/or USE=static is specified.
+
*lapack-reference-3.5.0 (08 Dec 2013)
08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index aca6ba0..9b14bf0 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -3,15 +3,21 @@
# $Header: $
EAPI=5
-inherit fortran-2 cmake-utils alternatives-2 toolchain-funcs
-
-MYP=lapack-${PV}
+inherit fortran-2 cmake-utils multibuild alternatives-2 toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
- inherit subversion
+ # The master ESVN_REPO_URI is difficult to access, the git mirror is easier
+ # ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
+ # MY_PN=lapack
+ # inherit subversion
+ EGIT_REPO_URI="https://github.com/nschloe/lapack.git"
+ MY_PN=lapack-reference
+ MYP=${MY_PN}-${PV}
+ inherit git-r3
KEYWORDS=""
else
+ MY_PN=lapack
+ MYP=${MY_PN}-${PV}
SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
@@ -22,7 +28,7 @@ HOMEPAGE="http://www.netlib.org/lapack/"
LICENSE="BSD"
SLOT="0"
-IUSE="static-libs test xblas"
+IUSE="int64 static-libs test xblas"
RDEPEND="
virtual/blas
@@ -32,21 +38,66 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MYP}"
+INT64_SUFFIX="int64"
+STATIC_SUFFIX="static"
+BASE_PROFNAME="reflapack"
+
+get_profname() {
+ local profname="${1:-${BASE_PROFNAME}}"
+ if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+ profname+="-${INT64_SUFFIX}"
+ fi
+ echo "${profname}"
+}
+
+get_variant_suffix() {
+ local profname="${1:-$(get_profname)}"
+ local variant_suffix="${profname//${BASE_PROFNAME}/}"
+ echo "${variant_suffix}"
+}
+
+get_blas_profname() {
+ local profname="${1:-$(get_profname)}"
+ local variant_suffix=$(get_variant_suffix "${profname}")
+ local selected_blas_profile="${blas_profile}"
+ local blas_no_int64="${selected_blas_profile/-int64/}"
+ local blas_base="${blas_no_int64%-*}"
+ local blas_name="${blas_no_int64/${blas_base}/${blas_base}${variant_suffix}}"
+ echo "${blas_name}"
+}
+
+pkg_setup() {
+ blas_profile=$(eselect blas show)
+ MULTIBUILD_VARIANTS=( )
+ use static-libs && MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${STATIC_SUFFIX} )
+ if use int64; then
+ MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
+ use static-libs && MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX}_${STATIC_SUFFIX} )
+ fi
+ MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME} )
+}
+
src_prepare() {
+ if use int64; then
+ local blas_int64_profname=$(get_blas_profname "${BASE_PROFNAME}-${INT64_SUFFIX}")
+ pkg-config --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
+ fi
+
# rename library to avoid collision with other lapack implementations
+ local LIBNAME="${PROFNAME//-/_}"
sed -i \
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
- -e '/export/s:lapack:reflapack:g' \
- -e '/ALL_TARGETS/s:lapack):reflapack):' \
- -e '/LAPACK_LIBRARIES/s:lapack:reflapack:g' \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+ -e '/export/s:lapack:${LIBNAME}:g' \
+ -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+ -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
CMakeLists.txt || die
sed -i \
- -e 's:(lapack:(reflapack:g' \
+ -e 's:(lapack:(${LIBNAME}:g' \
SRC/CMakeLists.txt || die
sed -i \
- -e 's:-llapack:-lreflapack:g' \
+ -e 's:-llapack:-l${LIBNAME}:g' \
+ -e 's/Requires: blas/Requires: ${BLAS_PROFNAME}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
lapack.pc.in || die
- use static-libs && mkdir "${WORKDIR}/${PN}_static"
# some string does not get passed properly
sed -i \
-e '/lapack_testing.py/d' \
@@ -64,33 +115,68 @@ src_prepare() {
}
src_configure() {
- lapack_configure() {
+ my_src_configure() {
+ local profname=$(get_profname)
+ local libname="${profname//-/_}"
+ local blas_profname=$(get_blas_profname)
+ echo "profname: ${profname}, blas_profname: ${blas_profname}"
local mycmakeargs=(
+ -DPROFNAME="${profname}"
+ -DBLAS_PROFNAME="${blas_profname}"
+ -DLIBNAME="${libname}"
-DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use_use xblas XBLAS)
$@
)
+ if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+ mycmakeargs+=(
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) -fdefault-integer-8"
+ -DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
+ )
+ else
+ mycmakeargs+=(
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname})"
+ -DLAPACK_PKGCONFIG_FFLAGS=""
+ )
+ fi
+ mycmakeargs+=(
+ -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
+ )
+ if [[ "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; 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
}
-
- lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
- -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+ multibuild_foreach_variant my_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ multibuild_foreach_variant cmake-utils_src_test
}
src_install() {
- cmake-utils_src_install
- use static-libs && \
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
- alternatives_for lapack reference 0 \
- /usr/$(get_libdir)/pkgconfig/lapack.pc reflapack.pc
+ my_src_install() {
+ cmake-utils_src_install
+ if [[ ! "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
+ local profname=$(get_profname)
+ alternatives_for lapack $(get_profname "reference") 0 \
+ /usr/$(get_libdir)/pkgconfig/lapack.pc ${profname}.pc
+ fi
+ }
+ multibuild_foreach_variant my_src_install
}
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index d769a14..9b618ae 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -13,6 +13,7 @@
Algebra Subprogram (BLAS).
</longdescription>
<use>
+ <flag name="int64">Build the 64 bits integer library</flag>
<flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
</use>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-06 5:56 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-06 5:56 UTC (permalink / raw
To: gentoo-commits
commit: cbbbed04e53145c0b018be3b16b495c682537b23
Author: gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:40:30 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:40:30 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbbbed04
Fix rebase lapack-multibuild to master conflict 11 on sci-libs/lapack-reference
---
sci-libs/lapack-reference/ChangeLog | 5 +++++
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 6fbd2ea..85c2139 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,11 @@
lapack-reference-9999.ebuild:
Add xblas to the .pc file when it is in use see bug#523388
+ 07 Sep 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild:
+ Remove the lines changing the setting of the FC and F77 environment
+ variables, instead pass the $(get_abi_CFLAGS) to cmake in the setting of the
+ -DCMAKE_Fortran_FLAGS variable.
+
26 Apr 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild:
Add >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?] to
RDEPEND. Use separate eselect modules for lapack and lapack-int64.
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 17f3a04..e2ef959 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -114,8 +114,6 @@ _int64_multilib_multibuild_wrapper() {
local v="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
local ABI="${v/_${STATIC_SUFFIX}/}"
multilib_toolchain_setup "${ABI}"
- export FC="$(tc-getFC) $(get_abi_CFLAGS)"
- export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
}
@@ -175,12 +173,12 @@ src_configure() {
)
if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
mycmakeargs+=(
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) -fdefault-integer-8"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8"
-DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
)
else
mycmakeargs+=(
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname})"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS)"
-DLAPACK_PKGCONFIG_FFLAGS=""
)
fi
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-06 5:56 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-06 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 96347461e8152e8fbb26ba0b43c72646ad3e2c6a
Author: gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 13:45:45 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:10:07 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=96347461
multilib as well for lapack-reference
---
.../lapack-reference/lapack-reference-9999.ebuild | 64 +++++++++++++++-------
1 file changed, 45 insertions(+), 19 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 9b14bf0..57d64e5 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-inherit fortran-2 cmake-utils multibuild alternatives-2 toolchain-funcs
+inherit fortran-2 cmake-utils multibuild alternatives-2 multilib-build toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
# The master ESVN_REPO_URI is difficult to access, the git mirror is easier
@@ -59,6 +59,7 @@ get_variant_suffix() {
get_blas_profname() {
local profname="${1:-$(get_profname)}"
local variant_suffix=$(get_variant_suffix "${profname}")
+ local blas_profile=$(eselect blas show)
local selected_blas_profile="${blas_profile}"
local blas_no_int64="${selected_blas_profile/-int64/}"
local blas_base="${blas_no_int64%-*}"
@@ -66,18 +67,40 @@ get_blas_profname() {
echo "${blas_name}"
}
-pkg_setup() {
- blas_profile=$(eselect blas show)
- MULTIBUILD_VARIANTS=( )
- use static-libs && MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${STATIC_SUFFIX} )
- if use int64; then
- MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
- use static-libs && MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX}_${STATIC_SUFFIX} )
- fi
- MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME} )
+int64_multilib_get_enabled_abis() {
+ local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
+ local MULTILIB_INT64_VARIANTS=()
+ for i in "${MULTILIB_VARIANTS[@]}"; do
+ if use int64 && [[ "${i}" =~ 64$ ]]; then
+ MULTILIB_INT64_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+ fi
+ MULTILIB_INT64_VARIANTS+=( "${i}" )
+ done
+ local MULTIBUILD_VARIANTS=()
+ for j in "${MULTILIB_INT64_VARIANTS[@]}"; do
+ use static-libs && MULTIBUILD_VARIANTS+=( "${j}_${STATIC_SUFFIX}" )
+ MULTIBUILD_VARIANTS+=( "${j}" )
+ done
+ echo "${MULTIBUILD_VARIANTS[@]}"
+}
+
+# @FUNCTION: _int64_multilib_multibuild_wrapper
+# @USAGE: <argv>...
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for ABI selected for multibuild.
+_int64_multilib_multibuild_wrapper() {
+ debug-print-function ${FUNCNAME} "${@}"
+ local v="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+ local ABI="${v/_${STATIC_SUFFIX}/}"
+ multilib_toolchain_setup "${ABI}"
+ export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+ export F77="$(tc-getF77) $(get_abi_CFLAGS)"
+ "${@}"
}
src_prepare() {
+ local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
if use int64; then
local blas_int64_profname=$(get_blas_profname "${BASE_PROFNAME}-${INT64_SUFFIX}")
pkg-config --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
@@ -115,11 +138,11 @@ src_prepare() {
}
src_configure() {
+ local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_src_configure() {
local profname=$(get_profname)
local libname="${profname//-/_}"
local blas_profname=$(get_blas_profname)
- echo "profname: ${profname}, blas_profname: ${blas_profname}"
local mycmakeargs=(
-DPROFNAME="${profname}"
-DBLAS_PROFNAME="${blas_profname}"
@@ -141,10 +164,6 @@ src_configure() {
-DLAPACK_PKGCONFIG_FFLAGS=""
)
fi
- mycmakeargs+=(
- -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
- -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
- )
if [[ "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
mycmakeargs+=(
-DBUILD_SHARED_LIBS=OFF
@@ -156,20 +175,27 @@ src_configure() {
-DBUILD_STATIC_LIBS=OFF
)
fi
+ mycmakeargs+=(
+ -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
+ )
cmake-utils_src_configure
}
- multibuild_foreach_variant my_src_configure
+ multibuild_foreach_variant _int64_multilib_multibuild_wrapper my_src_configure
}
src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
+ local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
+ multibuild_foreach_variant _int64_multilib_multibuild_wrapper cmake-utils_src_compile
}
src_test() {
- multibuild_foreach_variant cmake-utils_src_test
+ local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
+ multibuild_foreach_variant _int64_multilib_multibuild_wrapper cmake-utils_src_test
}
src_install() {
+ local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_src_install() {
cmake-utils_src_install
if [[ ! "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
@@ -178,5 +204,5 @@ src_install() {
/usr/$(get_libdir)/pkgconfig/lapack.pc ${profname}.pc
fi
}
- multibuild_foreach_variant my_src_install
+ multibuild_foreach_variant _int64_multilib_multibuild_wrapper my_src_install
}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-06 5:56 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-06 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 2d1a9cc85292ef5eabe106a9f00625092ba007b9
Author: gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:12:03 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:12:03 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2d1a9cc8
Fix rebase lapack-multibuild to master conflict 2 on sci-libs/lapack-reference
---
sci-libs/lapack-reference/ChangeLog | 4 +++
.../lapack-reference/lapack-reference-9999.ebuild | 30 ++++++++++++++++++----
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 4df9585..6fbd2ea 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,10 @@
lapack-reference-9999.ebuild:
Add xblas to the .pc file when it is in use see bug#523388
+ 26 Apr 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild:
+ Add >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?] to
+ RDEPEND. Use separate eselect modules for lapack and lapack-int64.
+
18 Feb 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild,
metadata.xml:
multibuild lapack-reference when USE=int64 and/or USE=static is specified.
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 57d64e5..17f3a04 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -31,8 +31,10 @@ SLOT="0"
IUSE="int64 static-libs test xblas"
RDEPEND="
- virtual/blas
+ >=virtual/blas-2.1-r1[int64?]
+ >=virtual/lapack-3.5-r2[int64?]
xblas? ( sci-libs/xblas[fortran] )"
+
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -56,10 +58,18 @@ get_variant_suffix() {
echo "${variant_suffix}"
}
+get_blas_module() {
+ local module_name="blas"
+ if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+ module_name+="-${INT64_SUFFIX}"
+ fi
+ echo "${module_name}"
+}
+
get_blas_profname() {
local profname="${1:-$(get_profname)}"
local variant_suffix=$(get_variant_suffix "${profname}")
- local blas_profile=$(eselect blas show)
+ local blas_profile=$(eselect $(get_blas_module) show)
local selected_blas_profile="${blas_profile}"
local blas_no_int64="${selected_blas_profile/-int64/}"
local blas_base="${blas_no_int64%-*}"
@@ -67,9 +77,18 @@ get_blas_profname() {
echo "${blas_name}"
}
+get_lapack_module() {
+ local module_name="lapack"
+ if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+ module_name+="-${INT64_SUFFIX}"
+ fi
+ echo "${module_name}"
+}
+
int64_multilib_get_enabled_abis() {
local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTILIB_INT64_VARIANTS=()
+ local i
for i in "${MULTILIB_VARIANTS[@]}"; do
if use int64 && [[ "${i}" =~ 64$ ]]; then
MULTILIB_INT64_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
@@ -77,6 +96,7 @@ int64_multilib_get_enabled_abis() {
MULTILIB_INT64_VARIANTS+=( "${i}" )
done
local MULTIBUILD_VARIANTS=()
+ local j
for j in "${MULTILIB_INT64_VARIANTS[@]}"; do
use static-libs && MULTIBUILD_VARIANTS+=( "${j}_${STATIC_SUFFIX}" )
MULTIBUILD_VARIANTS+=( "${j}" )
@@ -103,7 +123,7 @@ src_prepare() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
if use int64; then
local blas_int64_profname=$(get_blas_profname "${BASE_PROFNAME}-${INT64_SUFFIX}")
- pkg-config --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
+ $(tc-getPKG_CONFIG) --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
fi
# rename library to avoid collision with other lapack implementations
@@ -200,8 +220,8 @@ src_install() {
cmake-utils_src_install
if [[ ! "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
local profname=$(get_profname)
- alternatives_for lapack $(get_profname "reference") 0 \
- /usr/$(get_libdir)/pkgconfig/lapack.pc ${profname}.pc
+ alternatives_for $(get_lapack_module) $(get_profname "reference") 0 \
+ /usr/$(get_libdir)/pkgconfig/$(get_lapack_module).pc ${profname}.pc
fi
}
multibuild_foreach_variant _int64_multilib_multibuild_wrapper my_src_install
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-06 6:53 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-06 6:53 UTC (permalink / raw
To: gentoo-commits
commit: c64c5fec8b39f174a8064223b8e5d0311e238cd7
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 06:53:28 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 06:53:28 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c64c5fec
sci-libs/lapack-reference: respect flags
Package-Manager: portage-2.2.14_rc1
---
sci-libs/lapack-reference/ChangeLog | 4 ++++
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 4 ++--
sci-libs/lapack-reference/metadata.xml | 12 ++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 85c2139..f8e700c 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 06 Oct 2014; Justin Lecher <jlec@gentoo.org> lapack-reference-9999.ebuild,
+ metadata.xml:
+ respect flags
+
25 Sep 2014; François Bissey <francois.bissey@canterbury.ac.nz>
lapack-reference-9999.ebuild:
The dependency needs to be on xblas[fortran] otherwise libxblas won't have the
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index e2ef959..050c477 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -173,12 +173,12 @@ src_configure() {
)
if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
mycmakeargs+=(
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8 ${FCFLAGS}"
-DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
)
else
mycmakeargs+=(
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS)"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) ${FCFLAGS}"
-DLAPACK_PKGCONFIG_FFLAGS=""
)
fi
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 9b618ae..f9de0d5 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Linear Algebra PACKage (LAPACK) is a comprehensive library that
does linear algebra operations including matrix inversions, least
squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,9 +12,9 @@
Netlib for LAPACK and optionnally the one for the Basic Linear
Algebra Subprogram (BLAS).
</longdescription>
-<use>
- <flag name="int64">Build the 64 bits integer library</flag>
- <flag name="xblas">Build LAPACK with extra precision (needs
+ <use>
+ <flag name="int64">Build the 64 bits integer library</flag>
+ <flag name="xblas">Build LAPACK with extra precision (needs
<pkg>sci-libs/xblas</pkg>)</flag>
-</use>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-08 14:16 Honza Macháček
0 siblings, 0 replies; 33+ messages in thread
From: Honza Macháček @ 2014-10-08 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 7a5a33e07e3983825e34ca10acc17554252bb6c2
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Wed Oct 8 13:56:09 2014 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Wed Oct 8 13:56:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a5a33e0
The circular dependency of sci-libs/lapack-reference-3.5.0 on virtual/lapack removed.
Package-Manager: portage-2.2.14_rc1
---
sci-libs/lapack-reference/ChangeLog | 4 ++++
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index f8e700c..d50e3cc 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
+ 08 Oct 2014; Honza Macháček <Hloupy.Honza@centrum.cz>
+ lapack-reference-9999.ebuild:
+ The circular dependency on virtual/lapack removed.
+
06 Oct 2014; Justin Lecher <jlec@gentoo.org> lapack-reference-9999.ebuild,
metadata.xml:
respect flags
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 050c477..02e8871 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -32,7 +32,6 @@ IUSE="int64 static-libs test xblas"
RDEPEND="
>=virtual/blas-2.1-r1[int64?]
- >=virtual/lapack-3.5-r2[int64?]
xblas? ( sci-libs/xblas[fortran] )"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2014-10-13 9:19 Francois Bissey
0 siblings, 0 replies; 33+ messages in thread
From: Francois Bissey @ 2014-10-13 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 016ec1d0bdaa14b88e3556dffc692ba1de7969f5
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Mon Oct 13 09:17:07 2014 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Mon Oct 13 09:17:07 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=016ec1d0
Fix support for xblas, it is only available for 32bit integers.
---
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 02e8871..18e5e7c 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -136,7 +136,7 @@ src_prepare() {
SRC/CMakeLists.txt || die
sed -i \
-e 's:-llapack:-l${LIBNAME}:g' \
- -e 's/Requires: blas/Requires: ${BLAS_PROFNAME}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
+ -e 's/Requires: blas/Requires: ${BLAS_PROFNAME} ${XBLASPC}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
lapack.pc.in || die
# some string does not get passed properly
sed -i \
@@ -146,12 +146,6 @@ src_prepare() {
sed -i \
-e '/lapack_install_library(tmglib)/d' \
TESTING/MATGEN/CMakeLists.txt || die
- # if xblas is used add it in the .pc file
- if use xblas ; then
- sed -i \
- -e '/Requires/s:blas:blas xblas:' \
- lapack.pc.in || die
- fi
}
src_configure() {
@@ -160,6 +154,7 @@ src_configure() {
local profname=$(get_profname)
local libname="${profname//-/_}"
local blas_profname=$(get_blas_profname)
+ local xblaspc=""
local mycmakeargs=(
-DPROFNAME="${profname}"
-DBLAS_PROFNAME="${blas_profname}"
@@ -167,18 +162,23 @@ src_configure() {
-DUSE_OPTIMIZED_BLAS=ON
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
$(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_use xblas XBLAS)
$@
)
+ # xblas is only available for 32bit integers
if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
mycmakeargs+=(
-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8 ${FCFLAGS}"
-DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
+ -DXBLASPC=""
+ -DUSE_XBLAS=OFF
)
else
+ use xblas && xblaspc="xblas"
mycmakeargs+=(
-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) ${FCFLAGS}"
-DLAPACK_PKGCONFIG_FFLAGS=""
+ -DXBLASPC="${xblaspc}"
+ $(cmake-utils_use_use xblas XBLAS)
)
fi
if [[ "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2015-11-30 18:33 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-11-30 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 6d88f2276ab3a1c256b3fb98482c6381f4ee030d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 13:20:46 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 13:20:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6d88f227
sci-libs/lapack-reference: Version Bump
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../lapack-reference/lapack-reference-3.6.0.ebuild | 119 +++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
new file mode 100644
index 0000000..5e3cb88
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -0,0 +1,119 @@
+# 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="reflapack"
+
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+ xblas? ( sci-libs/xblas[fortran,int64?] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ numeric-int64_ensure_blas_int_support
+
+ # rename library to avoid collision with other lapack implementations
+ # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
+ # are in single quotes in the following seds. They are set later by
+ # defining a cmake variables with -DPROFNAME etc in src_configure.
+ sed \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+ -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+ -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
+ -i CMakeLists.txt || die
+ sed -i \
+ -e 's:(lapack:(${LIBNAME}:g' \
+ -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
+ SRC/CMakeLists.txt || die
+ sed -i \
+ -e '/Name: /s:lapack:${PROFNAME}:' \
+ -e 's:-llapack:-l${LIBNAME}:g' \
+ -e '/Requires: /s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \
+ lapack.pc.in || die
+ # some string does not get passed properly
+ sed -i \
+ -e '/lapack_testing.py/d' \
+ CTestCustom.cmake.in || die
+ # separate ebuild to tmglib
+ sed -i \
+ -e '/lapack_install_library(tmglib)/d' \
+ TESTING/MATGEN/CMakeLists.txt || die
+}
+
+src_configure() {
+ lapack_configure() {
+ local profname=$(numeric-int64_get_module_name)
+ local libname="${profname//-/_}"
+ local blas_profname=$(numeric-int64_get_blas_alternative)
+ local xblas_profname=$(numeric-int64_get_xblas_alternative)
+ local xblas_libname="${xblas_profname//-/_}"
+ local blas_requires="${blas_profname}"
+ use xblas && \
+ blas_requires+=" ${xblas_profname}"
+ local mycmakeargs=(
+ -DPROFNAME="${profname}"
+ -DBLAS_REQUIRES="${blas_requires}"
+ -DLIBNAME="${libname}"
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_use xblas XBLAS)
+ -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
+ -DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
+ )
+ use xblas && \
+ mycmakeargs+=( -DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
+ 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 lapack_configure
+}
+
+src_compile() {
+ numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_compile
+}
+
+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
+ numeric-int64-multibuild_install_alternative lapack reference
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2015-11-30 18:33 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-11-30 18:33 UTC (permalink / raw
To: gentoo-commits
commit: b98f9a007215d0a6819db2e4583eb8b70c0cadc6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 14:47:45 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 14:47:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b98f9a00
sci-libs/lapack-reference: Set subslots
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild | 2 +-
sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild | 2 +-
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
index 30458b5..84b5292 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/"
SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs test xblas"
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index 5e3cb88..8623bef 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/"
SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs test xblas"
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 466c762..8d46590 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.netlib.org/lapack/"
EGIT_REPO_URI="https://github.com/nschloe/lapack.git"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS=""
IUSE="static-libs test xblas"
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2015-12-01 6:52 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-12-01 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 5cc6855b8f846521f1c354e79c943fa3120bea34
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 06:51:57 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 06:51:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5cc6855b
sci-libs/lapack-reference: Add USE to build deprecated routines
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild | 3 ++-
sci-libs/lapack-reference/metadata.xml | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index 8623bef..ac88f98 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
+IUSE="+deprecated static-libs test xblas"
REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
@@ -82,6 +82,7 @@ src_configure() {
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use_use xblas XBLAS)
+ $(cmake-utils_use_build deprecated DEPRECATED)
-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
-DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index f9de0d5..520530d 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -13,8 +13,10 @@
Algebra Subprogram (BLAS).
</longdescription>
<use>
+ <flag name="deprecated">Build deprecated routines</flag>
<flag name="int64">Build the 64 bits integer library</flag>
- <flag name="xblas">Build LAPACK with extra precision (needs
- <pkg>sci-libs/xblas</pkg>)</flag>
+ <flag name="xblas">
+ Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)
+ </flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2015-12-03 9:54 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-12-03 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 11f24ae828fb53590884c6813c93ba98bbb1ee50
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Thu Dec 3 08:38:45 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 09:42:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=11f24ae8
sci-libs/lapack-reference: revbump
.../{lapack-reference-3.6.0.ebuild => lapack-reference-3.6.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
index c06fe42..bec6ed9 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
NUMERIC_MODULE_NAME="reflapack"
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 eutils
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1
MY_PN=lapack
MYP=${MY_PN}-${PV}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2015-12-03 9:55 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-12-03 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 78eb73445aa8fea78e969d6ce4a6431e757fe0f7
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Thu Dec 3 08:38:45 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 08:38:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=78eb7344
sci-libs/lapack-reference: revbump
.../{lapack-reference-3.6.0.ebuild => lapack-reference-3.6.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
index c06fe42..bec6ed9 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
NUMERIC_MODULE_NAME="reflapack"
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 eutils
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1
MY_PN=lapack
MYP=${MY_PN}-${PV}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2016-10-12 6:30 Marius Brehler
0 siblings, 0 replies; 33+ messages in thread
From: Marius Brehler @ 2016-10-12 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 0a61dacbb33957629374023397bee4ab13980ed9
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 19:56:36 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Sep 24 20:10:31 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a61dacb
sci-libs/lapack-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
.../{lapack-reference-3.5.0.ebuild => lapack-reference-3.5.0-r100.ebuild} | 0
...apack-reference-3.6.0-r1.ebuild => lapack-reference-3.6.0-r100.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
similarity index 100%
rename from sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild
similarity index 100%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild
^ permalink raw reply [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2018-06-21 18:43 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2018-06-21 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 2a6f2f23e7e8acd665cf02df87d3b6063d94d9fb
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 18:36:51 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:36:51 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2a6f2f23
sci-libs/lapack-reference: Clean old
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../lapack-reference-3.5.0-r100.ebuild | 117 -------------------
.../lapack-reference-3.6.0-r100.ebuild | 124 ---------------------
.../lapack-reference-3.6.1-r100.ebuild | 124 ---------------------
3 files changed, 365 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
deleted file mode 100644
index e41622ff5..000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
+++ /dev/null
@@ -1,117 +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="reflapack"
-
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1
-
-MY_PN=lapack
-MYP=${MY_PN}-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
-
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
- xblas? ( sci-libs/xblas[fortran,int64?] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- numeric-int64_ensure_blas_int_support
-
- # rename library to avoid collision with other lapack implementations
- # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
- # are in single quotes in the following seds. They are set later by
- # defining a cmake variables with -DPROFNAME etc in src_configure.
- sed -i \
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
- -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
- -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
- CMakeLists.txt || die
- sed -i \
- -e 's:(lapack:(${LIBNAME}:g' \
- SRC/CMakeLists.txt || die
- sed -i \
- -e '/Name: /s:lapack:${PROFNAME}:' \
- -e 's:-llapack:-l${LIBNAME}:g' \
- -e '/Requires: /s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \
- lapack.pc.in || die
- # some string does not get passed properly
- sed -i \
- -e '/lapack_testing.py/d' \
- CTestCustom.cmake.in || die
- # separate ebuild to tmglib
- sed -i \
- -e '/lapack_install_library(tmglib)/d' \
- TESTING/MATGEN/CMakeLists.txt || die
-}
-
-src_configure() {
- lapack_configure() {
- local profname=$(numeric-int64_get_module_name)
- local libname="${profname//-/_}"
- local blas_profname=$(numeric-int64_get_blas_alternative)
- local xblas_profname=$(numeric-int64_get_xblas_alternative)
- local xblas_libname="${xblas_profname//-/_}"
- local blas_requires="${blas_profname}"
- use xblas && \
- blas_requires+=" ${xblas_profname}"
- local mycmakeargs=(
- -DPROFNAME="${profname}"
- -DBLAS_REQUIRES="${blas_requires}"
- -DLIBNAME="${libname}"
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_use xblas XBLAS)
- -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
- -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
- -DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
- )
- use xblas && \
- mycmakeargs+=( -DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
- 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 lapack_configure
-}
-
-src_compile() {
- numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_compile
-}
-
-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
- numeric-int64-multibuild_install_alternative lapack reference
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild
deleted file mode 100644
index 2528c801b..000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild
+++ /dev/null
@@ -1,124 +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="reflapack"
-
-inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1
-
-MY_PN=lapack
-MYP=${MY_PN}-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+deprecated static-libs test xblas"
-
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
- xblas? ( sci-libs/xblas[fortran,int64?] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${MYP}"
-PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
-
-src_prepare() {
- numeric-int64_ensure_blas_int_support
-
- # 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 lapack implementations
- # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
- # are in single quotes in the following seds. They are set later by
- # defining a cmake variables with -DPROFNAME etc in src_configure.
- sed \
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
- -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
- -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
- -i CMakeLists.txt || die
- sed -i \
- -e 's:(lapack:(${LIBNAME}:g' \
- -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
- SRC/CMakeLists.txt || die
- sed -i \
- -e '/Name: /s:lapack:@PROFNAME@:' \
- -e 's:-llapack:-l@LIBNAME@:g' \
- -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: ${LAPACK_PKGCONFIG_FFLAGS}:' \
- lapack.pc.in || die
- # some string does not get passed properly
- sed -i \
- -e '/lapack_testing.py/d' \
- CTestCustom.cmake.in || die
- # separate ebuild to tmglib
- sed -i \
- -e '/lapack_install_library(tmglib)/d' \
- TESTING/MATGEN/CMakeLists.txt || die
-}
-
-src_configure() {
- lapack_configure() {
- local profname=$(numeric-int64_get_module_name)
- local libname="${profname//-/_}"
- local blas_profname=$(numeric-int64_get_blas_alternative)
- local xblas_profname=$(numeric-int64_get_xblas_alternative)
- local xblas_libname="${xblas_profname//-/_}"
- local blas_requires="${blas_profname}"
- use xblas && \
- blas_requires+=" ${xblas_profname}"
- local mycmakeargs=(
- -DPROFNAME="${profname}"
- -DBLAS_REQUIRES="${blas_requires}"
- -DLIBNAME="${libname}"
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_use xblas XBLAS)
- $(cmake-utils_use_build deprecated DEPRECATED)
- -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
- -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
- -DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
- )
- use xblas && \
- mycmakeargs+=( -DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
- 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 lapack_configure
-}
-
-src_compile() {
- numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_compile
-}
-
-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
- numeric-int64-multibuild_install_alternative lapack reference
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild
deleted file mode 100644
index 42c17131e..000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-NUMERIC_MODULE_NAME="reflapack"
-
-inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1
-
-MY_PN=lapack
-MYP=${MY_PN}-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+deprecated static-libs test xblas"
-
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
- xblas? ( sci-libs/xblas[fortran,int64?] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${MYP}"
-PATCHES=( "${FILESDIR}/lapack-${PV}-fix-build-system.patch" )
-
-src_prepare() {
- numeric-int64_ensure_blas_int_support
-
- # 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 lapack implementations
- # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
- # are in single quotes in the following seds. They are set later by
- # defining a cmake variables with -DPROFNAME etc in src_configure.
- sed \
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
- -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
- -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
- -i CMakeLists.txt || die
- sed -i \
- -e 's:(lapack:(${LIBNAME}:g' \
- -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
- SRC/CMakeLists.txt || die
- sed -i \
- -e '/Name: /s:lapack:@PROFNAME@:' \
- -e 's:-llapack:-l@LIBNAME@:g' \
- -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: ${LAPACK_PKGCONFIG_FFLAGS}:' \
- lapack.pc.in || die
- # some string does not get passed properly
- sed -i \
- -e '/lapack_testing.py/d' \
- CTestCustom.cmake.in || die
- # separate ebuild to tmglib
- sed -i \
- -e '/lapack_install_library(tmglib)/d' \
- TESTING/MATGEN/CMakeLists.txt || die
-}
-
-src_configure() {
- lapack_configure() {
- local profname=$(numeric-int64_get_module_name)
- local libname="${profname//-/_}"
- local blas_profname=$(numeric-int64_get_blas_alternative)
- local xblas_profname=$(numeric-int64_get_xblas_alternative)
- local xblas_libname="${xblas_profname//-/_}"
- local blas_requires="${blas_profname}"
- use xblas && \
- blas_requires+=" ${xblas_profname}"
- local mycmakeargs=(
- -DPROFNAME="${profname}"
- -DBLAS_REQUIRES="${blas_requires}"
- -DLIBNAME="${libname}"
- -DUSE_OPTIMIZED_BLAS=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_use xblas XBLAS)
- $(cmake-utils_use_build deprecated DEPRECATED)
- -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
- -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
- -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
- -DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
- )
- use xblas && \
- mycmakeargs+=( -DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
- 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 lapack_configure
-}
-
-src_compile() {
- numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_compile
-}
-
-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
- numeric-int64-multibuild_install_alternative lapack reference
-}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2018-06-21 18:43 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2018-06-21 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 9a8650d9abf6246ed47f13f79cc125754f038f2d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 18:39:24 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:39:24 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a8650d9
sci-libs/lapack-reference: Bump EAPI
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index b9742cce2..9404e65c3 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2018-06-21 18:43 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2018-06-21 18:43 UTC (permalink / raw
To: gentoo-commits
commit: c4d9ac48f18eab5d44da15e8e8b36eca9d1353de
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 18:36:01 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:36:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4d9ac48
sci-libs/lapack-reference: Version Bump
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../lapack-reference-3.8.0-r100.ebuild | 120 +++++++++++++++++++++
1 file changed, 120 insertions(+)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
new file mode 100644
index 000000000..e5adb3ced
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
@@ -0,0 +1,120 @@
+# 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="reflapack"
+
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+deprecated static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+ xblas? ( sci-libs/xblas[fortran,int64?] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ numeric-int64_ensure_blas_int_support
+
+ default
+
+ # rename library to avoid collision with other lapack implementations
+ # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
+ # are in single quotes in the following seds. They are set later by
+ # defining a cmake variables with -DPROFNAME etc in src_configure.
+ sed \
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+ -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+ -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
+ -i CMakeLists.txt || die
+ sed -i \
+ -e 's:(lapack:(${LIBNAME}:g' \
+ -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
+ SRC/CMakeLists.txt || die
+ sed -i \
+ -e '/Name: /s:lapack:@PROFNAME@:' \
+ -e 's:-llapack:-l@LIBNAME@:g' \
+ -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: ${LAPACK_PKGCONFIG_FFLAGS}:' \
+ lapack.pc.in || die
+ # some string does not get passed properly
+ sed -i \
+ -e '/lapack_testing.py/d' \
+ CTestCustom.cmake.in || die
+ # separate ebuild to tmglib
+ sed -i \
+ -e '/lapack_install_library(tmglib)/d' \
+ TESTING/MATGEN/CMakeLists.txt || die
+}
+
+src_configure() {
+ lapack_configure() {
+ local profname=$(numeric-int64_get_module_name)
+ local libname="${profname//-/_}"
+ local blas_profname=$(numeric-int64_get_blas_alternative)
+ local xblas_profname=$(numeric-int64_get_xblas_alternative)
+ local xblas_libname="${xblas_profname//-/_}"
+ local blas_requires="${blas_profname}"
+ use xblas && \
+ blas_requires+=" ${xblas_profname}"
+ local mycmakeargs=(
+ -DPROFNAME="${profname}"
+ -DBLAS_REQUIRES="${blas_requires}"
+ -DLIBNAME="${libname}"
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBUILD_TESTING="$(usex test)"
+ -DUSE_XBLAS="$(usex xblas)"
+ -DBUILD_DEPRECATED="$(usex deprecated)"
+ -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) ${CXXFLAGS}"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) $(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
+ -DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
+ )
+ use xblas && \
+ mycmakeargs+=( -DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
+ 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 lapack_configure
+}
+
+src_compile() {
+ numeric-int64-multibuild_foreach_all_abi_variants cmake-utils_src_compile
+}
+
+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
+ numeric-int64-multibuild_install_alternative lapack reference
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/
@ 2018-06-21 19:47 Justin Lecher
0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2018-06-21 19:47 UTC (permalink / raw
To: gentoo-commits
commit: d5dd592716fd81b3d93d57bf5c7b415b055d647f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 19:06:01 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 19:06:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5dd5927
sci-libs/lapack-reference: Run cmake-utils_src_prepare
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild | 2 +-
sci-libs/lapack-reference/lapack-reference-9999.ebuild | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
index e5adb3ced..32b0cd5db 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${MYP}"
src_prepare() {
numeric-int64_ensure_blas_int_support
- default
+ cmake-utils_src_prepare
# rename library to avoid collision with other lapack implementations
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 9404e65c3..a22d2d722 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -40,6 +40,8 @@ S="${WORKDIR}/${MYP}"
src_prepare() {
numeric-int64_ensure_blas_int_support
+ cmake-utils_src_prepare
+
# rename library to avoid collision with other lapack implementations
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they
# are in single quotes in the following seds. They are set later by
^ permalink raw reply related [flat|nested] 33+ messages in thread
end of thread, other threads:[~2018-06-21 19:47 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-30 18:33 [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2018-06-21 19:47 Justin Lecher
2018-06-21 18:43 Justin Lecher
2018-06-21 18:43 Justin Lecher
2018-06-21 18:43 Justin Lecher
2016-10-12 6:30 Marius Brehler
2015-12-03 9:55 Justin Lecher
2015-12-03 9:54 Justin Lecher
2015-12-01 6:52 Justin Lecher
2015-11-30 18:33 Justin Lecher
2014-10-13 9:19 Francois Bissey
2014-10-08 14:16 Honza Macháček
2014-10-06 6:53 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-09-25 21:21 Francois Bissey
2014-09-25 10:45 Francois Bissey
2014-01-28 19:01 Sebastien Fabbro
2013-05-23 5:13 Sebastien Fabbro
2013-03-03 17:52 Justin Lecher
2012-11-29 0:06 Sebastien Fabbro
2012-11-29 0:06 Sebastien Fabbro
2012-11-29 0:06 Sebastien Fabbro
2012-10-26 16:53 Sebastien Fabbro
2012-04-25 15:10 Justin Lecher
2012-04-25 6:47 Justin Lecher
2012-02-23 9:18 Justin Lecher
2012-02-17 16:26 Sebastien Fabbro
2012-02-16 0:38 Sebastien Fabbro
2012-01-26 17:41 Sebastien Fabbro
2011-08-19 15:26 Andrea Arteaga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox