[gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/
@ 2011-08-23 20:01 Sebastien Fabbro
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-08-23 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     5d026ede7e9ea6f8a64826b006c049024a13ba83
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 20:00:59 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 20:00:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5d026ede

adding old blas to properly mask

---
 .../blas-reference-20070226-r1.ebuild              |   70 ++++++
 .../blas-reference-20070226-r2.ebuild              |   72 ++++++
 .../blas-reference/blas-reference-20070226.ebuild  |   60 +++++
 .../files/blas-reference-20070226-autotool.patch   |  243 ++++++++++++++++++++
 .../files/blas-reference-20070226-pkg-config.patch |   11 +
 .../blas-reference/files/eselect.blas.reference    |    4 +
 6 files changed, 460 insertions(+), 0 deletions(-)

diff --git a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
new file mode 100644
index 0000000..c930343
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild,v 1.9 2011/06/21 15:41:52 jlec Exp $
+
+EAPI=3
+
+inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="
+	virtual/fortran
+	app-admin/eselect-blas"
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+src_prepare() {
+	ESELECT_PROF=reference
+	epatch "${FILESDIR}"/${P}-autotool.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.blas.reference "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.blas.reference || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=blas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}

diff --git a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
new file mode 100644
index 0000000..872b281
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.9 2011/08/17 16:50:23 chithanh Exp $
+
+EAPI=3
+
+inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+IUSE="doc"
+
+DEPEND="
+	virtual/fortran
+	app-admin/eselect-blas"
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+src_prepare() {
+	ESELECT_PROF=reference
+	epatch \
+		"${FILESDIR}"/${P}-autotool.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.blas.reference "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.blas.reference || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=blas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}

diff --git a/sci-libs/blas-reference/blas-reference-20070226.ebuild b/sci-libs/blas-reference/blas-reference-20070226.ebuild
new file mode 100644
index 0000000..e7b7b26
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.25 2011/06/21 15:41:52 jlec Exp $
+
+inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="
+	virtual/fortran
+	app-admin/eselect-blas"
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+src_unpack() {
+	ESELECT_PROF=reference
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-autotool.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--libdir=/usr/$(get_libdir)/blas/reference
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=blas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}

diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch b/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
new file mode 100644
index 0000000..8d8192f
--- /dev/null
+++ b/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
@@ -0,0 +1,243 @@
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2007-07-16 10:14:29.000000000 +0100
+@@ -0,0 +1,14 @@
++AC_PREREQ(2.59)
++AC_INIT(blas, 20070226, lapack@cs.utk.edu)
++AM_INIT_AUTOMAKE([foreign])
++
++AC_LANG(Fortran 77)
++AC_PROG_F77
++AC_PROG_LIBTOOL
++
++AC_CONFIG_FILES([Makefile
++		 BLAS/Makefile
++		 BLAS/SRC/Makefile
++		 BLAS/TESTING/Makefile
++		 BLAS/blas.pc])
++AC_OUTPUT
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2007-07-16 01:51:11.000000000 +0100
+@@ -0,0 +1 @@
++SUBDIRS = BLAS
+--- BLAS/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ BLAS/Makefile.am	2007-08-14 11:38:42.000000000 +0100
+@@ -0,0 +1,7 @@
++SUBDIRS = SRC TESTING
++
++pkgconfigdir = $(libdir)
++pkgconfig_DATA = blas.pc
++
++EXTRA = blas.pc
++
+--- BLAS/blas.pc.in 	1970-01-01 01:00:00.000000000 +0100
++++ BLAS/blas.pc.in	2007-08-17 11:38:23.000000000 +0100
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: Basic Linear Algebra Subprograms F77 reference implementations
++Version: @PACKAGE_VERSION@
++URL: http://www.netlib.org/blas
++Libs: -lblas
++Libs.private: -lm
+--- BLAS/SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ BLAS/SRC/Makefile.am	2007-07-16 01:50:12.000000000 +0100
+@@ -0,0 +1,153 @@
++lib_LTLIBRARIES = libblas.la
++
++libblas_la_SOURCES = \
++	caxpy.f \
++	ccopy.f \
++	cdotc.f \
++	cdotu.f \
++	cgbmv.f \
++	cgemm.f \
++	cgemv.f \
++	cgerc.f \
++	cgeru.f \
++	chbmv.f \
++	chemm.f \
++	chemv.f \
++	cher2.f \
++	cher2k.f \
++	cher.f \
++	cherk.f \
++	chpmv.f \
++	chpr2.f \
++	chpr.f \
++	crotg.f \
++	cscal.f \
++	csrot.f \
++	csscal.f \
++	cswap.f \
++	csymm.f \
++	csyr2k.f \
++	csyrk.f \
++	ctbmv.f \
++	ctbsv.f \
++	ctpmv.f \
++	ctpsv.f \
++	ctrmm.f \
++	ctrmv.f \
++	ctrsm.f \
++	ctrsv.f \
++	dasum.f \
++	daxpy.f \
++	dcabs1.f \
++	dcopy.f \
++	ddot.f \
++	dgbmv.f \
++	dgemm.f \
++	dgemv.f \
++	dger.f \
++	dnrm2.f \
++	drot.f \
++	drotg.f \
++	drotm.f \
++	drotmg.f \
++	dsbmv.f \
++	dscal.f \
++	dsdot.f \
++	dspmv.f \
++	dspr2.f \
++	dspr.f \
++	dswap.f \
++	dsymm.f \
++	dsymv.f \
++	dsyr2.f \
++	dsyr2k.f \
++	dsyr.f \
++	dsyrk.f \
++	dtbmv.f \
++	dtbsv.f \
++	dtpmv.f \
++	dtpsv.f \
++	dtrmm.f \
++	dtrmv.f \
++	dtrsm.f \
++	dtrsv.f \
++	dzasum.f \
++	dznrm2.f \
++	icamax.f \
++	idamax.f \
++	isamax.f \
++	izamax.f \
++	lsame.f \
++	scabs1.f \
++	sasum.f \
++	saxpy.f \
++	scasum.f \
++	scnrm2.f \
++	scopy.f \
++	sdot.f \
++	sdsdot.f \
++	sgbmv.f \
++	sgemm.f \
++	sgemv.f \
++	sger.f \
++	snrm2.f \
++	srot.f \
++	srotg.f \
++	srotm.f \
++	srotmg.f \
++	ssbmv.f \
++	sscal.f \
++	sspmv.f \
++	sspr2.f \
++	sspr.f \
++	sswap.f \
++	ssymm.f \
++	ssymv.f \
++	ssyr2.f \
++	ssyr2k.f \
++	ssyr.f \
++	ssyrk.f \
++	stbmv.f \
++	stbsv.f \
++	stpmv.f \
++	stpsv.f \
++	strmm.f \
++	strmv.f \
++	strsm.f \
++	strsv.f \
++	xerbla.f \
++	zaxpy.f \
++	zcopy.f \
++	zdotc.f \
++	zdotu.f \
++	zdrot.f \
++	zdscal.f \
++	zgbmv.f \
++	zgemm.f \
++	zgemv.f \
++	zgerc.f \
++	zgeru.f \
++	zhbmv.f \
++	zhemm.f \
++	zhemv.f \
++	zher2.f \
++	zher2k.f \
++	zher.f \
++	zherk.f \
++	zhpmv.f \
++	zhpr2.f \
++	zhpr.f \
++	zrotg.f \
++	zscal.f \
++	zswap.f \
++	zsymm.f \
++	zsyr2k.f \
++	zsyrk.f \
++	ztbmv.f \
++	ztbsv.f \
++	ztpmv.f \
++	ztpsv.f \
++	ztrmm.f \
++	ztrmv.f \
++	ztrsm.f \
++	ztrsv.f
+--- BLAS/TESTING/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ BLAS/TESTING/Makefile.am	2007-07-16 01:50:12.000000000 +0100
+@@ -0,0 +1,27 @@
++TESTS = blas_tests
++
++blas_tests:
++	@install -m0755 blas_tests.sh blas_tests
++
++check_PROGRAMS = \
++	xsblat1 xdblat1 xcblat1 xzblat1 \
++	xsblat2 xdblat2 xcblat2 xzblat2 \
++	xsblat3 xdblat3 xcblat3 xzblat3
++
++LDADD = $(top_builddir)/BLAS/SRC/libblas.la
++
++xsblat1_SOURCES = sblat1.f
++xdblat1_SOURCES = dblat1.f
++xcblat1_SOURCES = cblat1.f
++xzblat1_SOURCES = zblat1.f
++
++xsblat2_SOURCES = sblat2.f
++xdblat2_SOURCES = dblat2.f
++xcblat2_SOURCES = cblat2.f
++xzblat2_SOURCES = zblat2.f
++
++xsblat3_SOURCES = sblat3.f
++xdblat3_SOURCES = dblat3.f
++xcblat3_SOURCES = cblat3.f
++xzblat3_SOURCES = zblat3.f
++
+--- BLAS/TESTING/blas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
++++ BLAS/TESTING/blas_tests.sh	2007-07-16 01:50:12.000000000 +0100
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++for t in cblat1 sblat1 dblat1 zblat1; do
++    ./x${t}
++done
++
++for t in cblat2 sblat2 dblat2 zblat2 cblat3 sblat3 dblat3 zblat3;  do
++    ./x${t} < ../${t}.in
++done

diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
new file mode 100644
index 0000000..14190f4
--- /dev/null
+++ b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
@@ -0,0 +1,11 @@
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+index 367c87b..44b86db 100644
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+ Version: @PACKAGE_VERSION@
+ URL: http://www.netlib.org/blas
+-Libs: -lblas
++Libs: -L@libdir@ -lblas
+ Libs.private: -lm

diff --git a/sci-libs/blas-reference/files/eselect.blas.reference b/sci-libs/blas-reference/files/eselect.blas.reference
new file mode 100644
index 0000000..edb10dd
--- /dev/null
+++ b/sci-libs/blas-reference/files/eselect.blas.reference
@@ -0,0 +1,4 @@
+blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
+blas/reference/libblas.so.0 /usr/@LIBDIR@/libblas.so.0
+blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
+../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/
@ 2011-09-07 21:51 Sebastien Fabbro
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-09-07 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f214ddeabcea0470f64295b6ff26201a0f00da7b
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 21:45:36 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 21:45:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f214ddea

upgrade version

---
 sci-libs/blas-reference/ChangeLog                  |   10 +
 .../blas-reference-20070226-r1.ebuild              |   70 ------
 .../blas-reference-20070226-r2.ebuild              |   72 ------
 .../blas-reference/blas-reference-20070226.ebuild  |   60 -----
 ....1-r1.ebuild => blas-reference-20110418.ebuild} |    2 +-
 .../files/blas-reference-20070226-autotool.patch   |  243 --------------------
 .../files/blas-reference-20070226-pkg-config.patch |   11 -
 .../blas-reference/files/eselect.blas.reference    |    4 -
 8 files changed, 11 insertions(+), 461 deletions(-)

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index ad41a64..1a8b723 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*blas-reference-20110418 (07 Sep 2011)
+
+  07 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -blas-reference-3.3.1-r1.ebuild, -blas-reference-20070226.ebuild,
+  -blas-reference-20070226-r1.ebuild, -blas-reference-20070226-r2.ebuild,
+  -files/blas-reference-20070226-autotool.patch,
+  -files/blas-reference-20070226-pkg-config.patch,
+  +blas-reference-20110418.ebuild, -files/eselect.blas.reference:
+  Moved 3.3.1 to 20110418 to facilitate upgrades
+
   19 Aug 2011 Andrea Arteaga <andyspiros@gmail.com> +blas-reference-3.3.1-r1.ebuild
   +Manifest +metadata.xml
   Imported from bicatali overlay.

diff --git a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
deleted file mode 100644
index c930343..0000000
--- a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild,v 1.9 2011/06/21 15:41:52 jlec Exp $
-
-EAPI=3
-
-inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
-
-LAPACKPV="3.1.1"
-LAPACKPN="lapack-lite"
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="
-	virtual/fortran
-	app-admin/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )"
-
-S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
-
-src_prepare() {
-	ESELECT_PROF=reference
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.blas.reference "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}

diff --git a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
deleted file mode 100644
index 872b281..0000000
--- a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.9 2011/08/17 16:50:23 chithanh Exp $
-
-EAPI=3
-
-inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
-
-LAPACKPV="3.1.1"
-LAPACKPN="lapack-lite"
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-DEPEND="
-	virtual/fortran
-	app-admin/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )"
-
-S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
-
-src_prepare() {
-	ESELECT_PROF=reference
-	epatch \
-		"${FILESDIR}"/${P}-autotool.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.blas.reference "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}

diff --git a/sci-libs/blas-reference/blas-reference-20070226.ebuild b/sci-libs/blas-reference/blas-reference-20070226.ebuild
deleted file mode 100644
index e7b7b26..0000000
--- a/sci-libs/blas-reference/blas-reference-20070226.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.25 2011/06/21 15:41:52 jlec Exp $
-
-inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
-
-LAPACKPV="3.1.1"
-LAPACKPN="lapack-lite"
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="
-	virtual/fortran
-	app-admin/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )"
-
-S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
-
-src_unpack() {
-	ESELECT_PROF=reference
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--libdir=/usr/$(get_libdir)/blas/reference
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}

diff --git a/sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild b/sci-libs/blas-reference/blas-reference-20110418.ebuild
similarity index 99%
rename from sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild
rename to sci-libs/blas-reference/blas-reference-20110418.ebuild
index 473701b..7e3ed83 100644
--- a/sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20110418.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 inherit eutils toolchain-funcs cmake-utils alternatives-2
 
-MYP=lapack-${PV}
+MYP=lapack-3.3.1
 
 DESCRIPTION="Reference implementation of BLAS and LAPACK"
 HOMEPAGE="http://www.netlib.org/lapack/"

diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch b/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
deleted file mode 100644
index 8d8192f..0000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-07-16 10:14:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+AC_PREREQ(2.59)
-+AC_INIT(blas, 20070226, lapack@cs.utk.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_LANG(Fortran 77)
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+
-+AC_CONFIG_FILES([Makefile
-+		 BLAS/Makefile
-+		 BLAS/SRC/Makefile
-+		 BLAS/TESTING/Makefile
-+		 BLAS/blas.pc])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-07-16 01:51:11.000000000 +0100
-@@ -0,0 +1 @@
-+SUBDIRS = BLAS
---- BLAS/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/Makefile.am	2007-08-14 11:38:42.000000000 +0100
-@@ -0,0 +1,7 @@
-+SUBDIRS = SRC TESTING
-+
-+pkgconfigdir = $(libdir)
-+pkgconfig_DATA = blas.pc
-+
-+EXTRA = blas.pc
-+
---- BLAS/blas.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/blas.pc.in	2007-08-17 11:38:23.000000000 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Basic Linear Algebra Subprograms F77 reference implementations
-+Version: @PACKAGE_VERSION@
-+URL: http://www.netlib.org/blas
-+Libs: -lblas
-+Libs.private: -lm
---- BLAS/SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/SRC/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,153 @@
-+lib_LTLIBRARIES = libblas.la
-+
-+libblas_la_SOURCES = \
-+	caxpy.f \
-+	ccopy.f \
-+	cdotc.f \
-+	cdotu.f \
-+	cgbmv.f \
-+	cgemm.f \
-+	cgemv.f \
-+	cgerc.f \
-+	cgeru.f \
-+	chbmv.f \
-+	chemm.f \
-+	chemv.f \
-+	cher2.f \
-+	cher2k.f \
-+	cher.f \
-+	cherk.f \
-+	chpmv.f \
-+	chpr2.f \
-+	chpr.f \
-+	crotg.f \
-+	cscal.f \
-+	csrot.f \
-+	csscal.f \
-+	cswap.f \
-+	csymm.f \
-+	csyr2k.f \
-+	csyrk.f \
-+	ctbmv.f \
-+	ctbsv.f \
-+	ctpmv.f \
-+	ctpsv.f \
-+	ctrmm.f \
-+	ctrmv.f \
-+	ctrsm.f \
-+	ctrsv.f \
-+	dasum.f \
-+	daxpy.f \
-+	dcabs1.f \
-+	dcopy.f \
-+	ddot.f \
-+	dgbmv.f \
-+	dgemm.f \
-+	dgemv.f \
-+	dger.f \
-+	dnrm2.f \
-+	drot.f \
-+	drotg.f \
-+	drotm.f \
-+	drotmg.f \
-+	dsbmv.f \
-+	dscal.f \
-+	dsdot.f \
-+	dspmv.f \
-+	dspr2.f \
-+	dspr.f \
-+	dswap.f \
-+	dsymm.f \
-+	dsymv.f \
-+	dsyr2.f \
-+	dsyr2k.f \
-+	dsyr.f \
-+	dsyrk.f \
-+	dtbmv.f \
-+	dtbsv.f \
-+	dtpmv.f \
-+	dtpsv.f \
-+	dtrmm.f \
-+	dtrmv.f \
-+	dtrsm.f \
-+	dtrsv.f \
-+	dzasum.f \
-+	dznrm2.f \
-+	icamax.f \
-+	idamax.f \
-+	isamax.f \
-+	izamax.f \
-+	lsame.f \
-+	scabs1.f \
-+	sasum.f \
-+	saxpy.f \
-+	scasum.f \
-+	scnrm2.f \
-+	scopy.f \
-+	sdot.f \
-+	sdsdot.f \
-+	sgbmv.f \
-+	sgemm.f \
-+	sgemv.f \
-+	sger.f \
-+	snrm2.f \
-+	srot.f \
-+	srotg.f \
-+	srotm.f \
-+	srotmg.f \
-+	ssbmv.f \
-+	sscal.f \
-+	sspmv.f \
-+	sspr2.f \
-+	sspr.f \
-+	sswap.f \
-+	ssymm.f \
-+	ssymv.f \
-+	ssyr2.f \
-+	ssyr2k.f \
-+	ssyr.f \
-+	ssyrk.f \
-+	stbmv.f \
-+	stbsv.f \
-+	stpmv.f \
-+	stpsv.f \
-+	strmm.f \
-+	strmv.f \
-+	strsm.f \
-+	strsv.f \
-+	xerbla.f \
-+	zaxpy.f \
-+	zcopy.f \
-+	zdotc.f \
-+	zdotu.f \
-+	zdrot.f \
-+	zdscal.f \
-+	zgbmv.f \
-+	zgemm.f \
-+	zgemv.f \
-+	zgerc.f \
-+	zgeru.f \
-+	zhbmv.f \
-+	zhemm.f \
-+	zhemv.f \
-+	zher2.f \
-+	zher2k.f \
-+	zher.f \
-+	zherk.f \
-+	zhpmv.f \
-+	zhpr2.f \
-+	zhpr.f \
-+	zrotg.f \
-+	zscal.f \
-+	zswap.f \
-+	zsymm.f \
-+	zsyr2k.f \
-+	zsyrk.f \
-+	ztbmv.f \
-+	ztbsv.f \
-+	ztpmv.f \
-+	ztpsv.f \
-+	ztrmm.f \
-+	ztrmv.f \
-+	ztrsm.f \
-+	ztrsv.f
---- BLAS/TESTING/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,27 @@
-+TESTS = blas_tests
-+
-+blas_tests:
-+	@install -m0755 blas_tests.sh blas_tests
-+
-+check_PROGRAMS = \
-+	xsblat1 xdblat1 xcblat1 xzblat1 \
-+	xsblat2 xdblat2 xcblat2 xzblat2 \
-+	xsblat3 xdblat3 xcblat3 xzblat3
-+
-+LDADD = $(top_builddir)/BLAS/SRC/libblas.la
-+
-+xsblat1_SOURCES = sblat1.f
-+xdblat1_SOURCES = dblat1.f
-+xcblat1_SOURCES = cblat1.f
-+xzblat1_SOURCES = zblat1.f
-+
-+xsblat2_SOURCES = sblat2.f
-+xdblat2_SOURCES = dblat2.f
-+xcblat2_SOURCES = cblat2.f
-+xzblat2_SOURCES = zblat2.f
-+
-+xsblat3_SOURCES = sblat3.f
-+xdblat3_SOURCES = dblat3.f
-+xcblat3_SOURCES = cblat3.f
-+xzblat3_SOURCES = zblat3.f
-+
---- BLAS/TESTING/blas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/blas_tests.sh	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+for t in cblat1 sblat1 dblat1 zblat1; do
-+    ./x${t}
-+done
-+
-+for t in cblat2 sblat2 dblat2 zblat2 cblat3 sblat3 dblat3 zblat3;  do
-+    ./x${t} < ../${t}.in
-+done

diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
deleted file mode 100644
index 14190f4..0000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 367c87b..44b86db 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
- Description: Basic Linear Algebra Subprograms F77 reference implementations
- Version: @PACKAGE_VERSION@
- URL: http://www.netlib.org/blas
--Libs: -lblas
-+Libs: -L@libdir@ -lblas
- Libs.private: -lm

diff --git a/sci-libs/blas-reference/files/eselect.blas.reference b/sci-libs/blas-reference/files/eselect.blas.reference
deleted file mode 100644
index edb10dd..0000000
--- a/sci-libs/blas-reference/files/eselect.blas.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
-blas/reference/libblas.so.0 /usr/@LIBDIR@/libblas.so.0
-blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
-../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/
@ 2012-04-25 16:10 Sebastien Fabbro
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2012-04-25 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     67ad3e44a3da307bb9dcf4d1dfe43a9a320decac
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Apr 25 16:09:09 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:09:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=67ad3e44

sci-libs/blas-reference: applied lapack patch to not compile tmglib when not needed

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/blas-reference/ChangeLog                  |    5 +
 .../blas-reference-20120215-r1.ebuild              |   66 ------
 .../blas-reference/blas-reference-20120423.ebuild  |    7 +-
 .../blas-reference/files/lapack-3.4.1-cmake.patch  |  208 ++++++++++++++++++++
 4 files changed, 217 insertions(+), 69 deletions(-)

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index 89e3019..45948d2 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/lapack-3.4.1-cmake.patch, -blas-reference-20120215-r1.ebuild,
+  blas-reference-20120423.ebuild:
+  applied lapack patch to not compile tmglib when not needed
+
   24 Apr 2012; Justin Lecher <jlec@gentoo.org> Manifest:
   Clean checksums
 

diff --git a/sci-libs/blas-reference/blas-reference-20120215-r1.ebuild b/sci-libs/blas-reference/blas-reference-20120215-r1.ebuild
deleted file mode 100644
index 1f9cd25..0000000
--- a/sci-libs/blas-reference/blas-reference-20120215-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit fortran-2 cmake-utils alternatives-2
-
-MYP=lapack-3.4.0_p${PV}
-
-DESCRIPTION="Reference implementation of BLAS"
-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 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-RDEPEND="virtual/fortran"
-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=OFF
-			$(cmake-utils_use_build test TESTING)
-			$@
-		)
-		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 -C BLAS
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-		cmake-utils_src_compile -C BLAS
-}
-
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}/BLAS" > /dev/null
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-	ctest ${ctestargs} || die
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install -C BLAS
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-			cmake-utils_src_install -C BLAS
-	alternatives_for blas reference 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc refblas.pc
-}

diff --git a/sci-libs/blas-reference/blas-reference-20120423.ebuild b/sci-libs/blas-reference/blas-reference-20120423.ebuild
index e057922..48d4f61 100644
--- a/sci-libs/blas-reference/blas-reference-20120423.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20120423.ebuild
@@ -23,11 +23,12 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${MYP}-cmake.patch
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 
 src_configure() {
-	lapack_configure() {
+	blas_configure() {
 		local mycmakeargs=(
 			-DUSE_OPTIMIZED_BLAS=OFF
 			$(cmake-utils_use_build test TESTING)
@@ -36,9 +37,9 @@ src_configure() {
 		cmake-utils_src_configure
 	}
 
-	lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+	blas_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
 	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" blas_configure \
 		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
 }
 

diff --git a/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch b/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch
new file mode 100644
index 0000000..78dece8
--- /dev/null
+++ b/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch
@@ -0,0 +1,208 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1294)
++++ CMakeLists.txt	(working copy)
+@@ -94,10 +94,6 @@
+ # Precision to build
+ # By default all precisions are generated
+ 
+-option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
+-option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
+-option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
+-option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
+ 
+ # --------------------------------------------------
+ # Subdirectories that need to be processed
+@@ -147,7 +143,49 @@
+   find_library(XBLAS_LIBRARY NAMES xblas)
+ endif(USE_XBLAS)
+    
+-add_subdirectory(SRC)
++option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
++
++# Check the usage of the user provided LAPACK libraries
++if(LAPACK_LIBRARIES)
++  include(CheckFortranFunctionExists)
++  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
++  CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND)
++  unset( CMAKE_REQUIRED_LIBRARIES )
++  if(LAPACK_FOUND)
++    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
++  else(LAPACK_FOUND)
++    message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.")
++    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
++    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
++    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
++  endif(LAPACK_FOUND)
++  
++  # User did not provide a LAPACK Library but specified to search for one
++elseif( USE_OPTIMIZED_LAPACK )
++  find_package( LAPACK )
++endif (LAPACK_LIBRARIES)
++
++# Neither user specified or optimized LAPACK libraries can be used
++if(NOT LAPACK_FOUND)
++  message(STATUS "Using supplied NETLIB LAPACK implementation")
++  set( LAPACK_LIBRARIES lapack )
++  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
++  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
++  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
++  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
++  add_subdirectory(SRC)
++else()
++  set( CMAKE_EXE_LINKER_FLAGS 
++    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for executables" FORCE)
++  set( CMAKE_MODULE_LINKER_FLAGS 
++    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for modules" FORCE)
++  set( CMAKE_SHARED_LINKER_FLAGS 
++    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for shared libs" FORCE)
++endif( NOT LAPACK_FOUND )
++
+ if(BUILD_TESTING)
+   add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+@@ -155,6 +193,10 @@
+ # --------------------------------------------------
+ # LAPACKE
+ option(LAPACKE "Build LAPACKE" OFF)
++if(LAPACKE)
++  add_subdirectory(lapacke)
++endif(LAPACKE)
++
+ # LAPACKE has also the interface to some routines from tmglib,
+ # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+ option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+@@ -162,9 +204,6 @@
+   option(LAPACKE "Build LAPACKE" ON)
+ endif(LAPACKE_WITH_TMG)
+ 
+-if(LAPACKE)
+-  add_subdirectory(lapacke)
+-endif(LAPACKE)
+ 
+ # --------------------------------------------------
+ # CPACK Packaging 
+@@ -202,20 +241,24 @@
+ OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
+ #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
+ 
+-if( NOT BLAS_FOUND )
+-  if(LAPACKE)
+-     export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake)
+-  else (LAPACKE)
+-     export(TARGETS blas lapack tmglib FILE lapack-targets.cmake)
+-  endif(LAPACKE)
+-else( NOT BLAS_FOUND )
+-  if(LAPACKE)
+-     export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake)
+-  else (LAPACKE)
+-     export(TARGETS lapack tmglib FILE lapack-targets.cmake)
+-  endif(LAPACKE)
+-endif( NOT BLAS_FOUND )
++if(NOT BLAS_FOUND)
++  set(ALL_TARGETS ${ALL_TARGETS} blas)
++endif(NOT BLAS_FOUND)
+ 
++if(NOT LAPACK_FOUND)
++  set(ALL_TARGETS ${ALL_TARGETS} lapack)
++endif(NOT LAPACK_FOUND)
++
++if(BUILD_TESTING OR LAPACKE_WITH_TMG)
++  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
++endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
++
++if(LAPACKE)
++  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
++endif(LAPACKE)
++
++export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
++
+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
+   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
+Index: lapacke/example/CMakeLists.txt
+===================================================================
+--- lapacke/example/CMakeLists.txt	(revision 1294)
++++ lapacke/example/CMakeLists.txt	(working copy)
+@@ -1,8 +1,8 @@
+ add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
+ add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c)
+ 
+-target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
++target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ 
+ add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
+ add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
+Index: lapacke/CMakeLists.txt
+===================================================================
+--- lapacke/CMakeLists.txt	(revision 1294)
++++ lapacke/CMakeLists.txt	(working copy)
+@@ -45,14 +45,14 @@
+ 
+ if (USE_XBLAS)
+    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
++   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ else (USE_XBLAS)
+   if (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
++   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+   else (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
++   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+   endif(LAPACKE_WITH_TMG)
+ endif(USE_XBLAS)
+ 
+Index: TESTING/LIN/CMakeLists.txt
+===================================================================
+--- TESTING/LIN/CMakeLists.txt	(revision 1294)
++++ TESTING/LIN/CMakeLists.txt	(working copy)
+@@ -193,7 +193,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack)
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+Index: TESTING/EIG/CMakeLists.txt
+===================================================================
+--- TESTING/EIG/CMakeLists.txt	(revision 1294)
++++ TESTING/EIG/CMakeLists.txt	(working copy)
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack )
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
+ endmacro(add_eig_executable)
+ 
+ if (BUILD_SINGLE)
+Index: TESTING/MATGEN/CMakeLists.txt
+===================================================================
+--- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
++++ TESTING/MATGEN/CMakeLists.txt	(working copy)
+@@ -64,12 +64,12 @@
+   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
+ endif()
+ 
+-list(REMOVE_DUPLICATES ALLOBJ)
+-
+ if (NOT ALLOBJ)
+ set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
+   ${DZATGEN})
++else()
++  list(REMOVE_DUPLICATES ALLOBJ)
+ endif()
+ add_library(tmglib ${ALLOBJ} )
+-target_link_libraries(tmglib lapack)
++target_link_libraries(tmglib ${LAPACK_LIBRARIES})
+ lapack_install_library(tmglib)



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/
@ 2013-05-23  5:13 Sebastien Fabbro
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2013-05-23  5:13 UTC (permalink / raw
  To: gentoo-commits

commit:     8c5d860c05a1e7738ab50d2311fef03351790bb4
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 16:48:22 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed May 22 16:48:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8c5d860c

sci-libs/blas-reference: Switch to EAPI5, merge live ebuild

Package-Manager: portage-2.2.01.21938-prefix

---
 sci-libs/blas-reference/ChangeLog                  |    4 +
 .../blas-reference/blas-reference-99999999.ebuild  |   68 ++++---
 .../blas-reference/files/lapack-3.4.1-cmake.patch  |  208 --------------------
 sci-libs/blas-reference/metadata.xml               |    4 +-
 4 files changed, 42 insertions(+), 242 deletions(-)

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index a844ad9..8af0f4d 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/lapack-3.4.1-cmake.patch, blas-reference-99999999.ebuild, metadata.xml:
+  sci-libs/blas-reference: Switch to EAPI5, merge live ebuild
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> blas-reference-20120925.ebuild,
   blas-reference-99999999.ebuild, metadata.xml:
   Cleaned deps

diff --git a/sci-libs/blas-reference/blas-reference-99999999.ebuild b/sci-libs/blas-reference/blas-reference-99999999.ebuild
index f8bcd6a..e5f8f5f 100644
--- a/sci-libs/blas-reference/blas-reference-99999999.ebuild
+++ b/sci-libs/blas-reference/blas-reference-99999999.ebuild
@@ -2,58 +2,64 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-inherit eutils toolchain-funcs cmake-utils alternatives-2 subversion
+inherit fortran-2 cmake-utils alternatives-2
+
+LPN=lapack
+LPV=3.4.2
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/${LPN}/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 DESCRIPTION="Reference implementation of BLAS"
 HOMEPAGE="http://www.netlib.org/lapack/"
-ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
-DOCS=( README )
-
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/${LPN}-${LPV}"
 
 src_prepare() {
-	# avoid collision with other blas
+	# rename library to avoid collision with other blas implementations
 	sed -i \
 		-e 's:blas:refblas:g' \
-		CMakeLists.txt BLAS/blas.pc.in BLAS/{SRC,TESTING}/CMakeLists.txt || die
+		CMakeLists.txt BLAS/blas.pc.in \
+		BLAS/{SRC,TESTING}/CMakeLists.txt || die
 	sed -i \
 		-e 's:BINARY_DIR}/blas:BINARY_DIR}/refblas:' \
 		BLAS/CMakeLists.txt || die
-	export FC=$(tc-getFC) F77=$(tc-getF77)
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 
-lapack_configure() {
-	mycmakeargs+=(
-		-DUSE_OPTIMIZED_BLAS=OFF
-		$(cmake-utils_use_build test TESTING)
-	)
-	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
+	blas_configure() {
+		local mycmakeargs=(
+			-DUSE_OPTIMIZED_BLAS=OFF
+			$(cmake-utils_use_build test TESTING)
+			$@
+		)
+		cmake-utils_src_configure
+	}
+
+	blas_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" blas_configure \
+		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
 }
 
 src_compile() {
 	cmake-utils_src_compile -C BLAS
-	if use static-libs; then
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-			cmake-utils_src_compile -C BLAS
-	fi
+	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
+		cmake-utils_src_compile -C BLAS
 }
 
 src_test() {
@@ -66,10 +72,8 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install -C BLAS
-	if use static-libs; then
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
+	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
 			cmake-utils_src_install -C BLAS
-	fi
 	alternatives_for blas reference 0 \
-		"/usr/$(get_libdir)/pkgconfig/blas.pc" "refblas.pc"
+		/usr/$(get_libdir)/pkgconfig/blas.pc refblas.pc
 }

diff --git a/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch b/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch
deleted file mode 100644
index 78dece8..0000000
--- a/sci-libs/blas-reference/files/lapack-3.4.1-cmake.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 1294)
-+++ CMakeLists.txt	(working copy)
-@@ -94,10 +94,6 @@
- # Precision to build
- # By default all precisions are generated
- 
--option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
--option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
--option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
--option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
- 
- # --------------------------------------------------
- # Subdirectories that need to be processed
-@@ -147,7 +143,49 @@
-   find_library(XBLAS_LIBRARY NAMES xblas)
- endif(USE_XBLAS)
-    
--add_subdirectory(SRC)
-+option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
-+
-+# Check the usage of the user provided LAPACK libraries
-+if(LAPACK_LIBRARIES)
-+  include(CheckFortranFunctionExists)
-+  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-+  CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND)
-+  unset( CMAKE_REQUIRED_LIBRARIES )
-+  if(LAPACK_FOUND)
-+    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
-+  else(LAPACK_FOUND)
-+    message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.")
-+    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
-+    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
-+    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
-+  endif(LAPACK_FOUND)
-+  
-+  # User did not provide a LAPACK Library but specified to search for one
-+elseif( USE_OPTIMIZED_LAPACK )
-+  find_package( LAPACK )
-+endif (LAPACK_LIBRARIES)
-+
-+# Neither user specified or optimized LAPACK libraries can be used
-+if(NOT LAPACK_FOUND)
-+  message(STATUS "Using supplied NETLIB LAPACK implementation")
-+  set( LAPACK_LIBRARIES lapack )
-+  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
-+  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
-+  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
-+  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
-+  add_subdirectory(SRC)
-+else()
-+  set( CMAKE_EXE_LINKER_FLAGS 
-+    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for executables" FORCE)
-+  set( CMAKE_MODULE_LINKER_FLAGS 
-+    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for modules" FORCE)
-+  set( CMAKE_SHARED_LINKER_FLAGS 
-+    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for shared libs" FORCE)
-+endif( NOT LAPACK_FOUND )
-+
- if(BUILD_TESTING)
-   add_subdirectory(TESTING)
- endif(BUILD_TESTING)
-@@ -155,6 +193,10 @@
- # --------------------------------------------------
- # LAPACKE
- option(LAPACKE "Build LAPACKE" OFF)
-+if(LAPACKE)
-+  add_subdirectory(lapacke)
-+endif(LAPACKE)
-+
- # LAPACKE has also the interface to some routines from tmglib,
- # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
- option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
-@@ -162,9 +204,6 @@
-   option(LAPACKE "Build LAPACKE" ON)
- endif(LAPACKE_WITH_TMG)
- 
--if(LAPACKE)
--  add_subdirectory(lapacke)
--endif(LAPACKE)
- 
- # --------------------------------------------------
- # CPACK Packaging 
-@@ -202,20 +241,24 @@
- OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
- #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
- 
--if( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS blas lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--else( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--endif( NOT BLAS_FOUND )
-+if(NOT BLAS_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} blas)
-+endif(NOT BLAS_FOUND)
- 
-+if(NOT LAPACK_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapack)
-+endif(NOT LAPACK_FOUND)
-+
-+if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
-+endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+
-+if(LAPACKE)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
-+endif(LAPACKE)
-+
-+export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
-+
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
-   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-Index: lapacke/example/CMakeLists.txt
-===================================================================
---- lapacke/example/CMakeLists.txt	(revision 1294)
-+++ lapacke/example/CMakeLists.txt	(working copy)
-@@ -1,8 +1,8 @@
- add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
- add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c)
- 
--target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
--target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
- 
- add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
- add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
-Index: lapacke/CMakeLists.txt
-===================================================================
---- lapacke/CMakeLists.txt	(revision 1294)
-+++ lapacke/CMakeLists.txt	(working copy)
-@@ -45,14 +45,14 @@
- 
- if (USE_XBLAS)
-    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
- else (USE_XBLAS)
-   if (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   else (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   endif(LAPACKE_WITH_TMG)
- endif(USE_XBLAS)
- 
-Index: TESTING/LIN/CMakeLists.txt
-===================================================================
---- TESTING/LIN/CMakeLists.txt	(revision 1294)
-+++ TESTING/LIN/CMakeLists.txt	(working copy)
-@@ -193,7 +193,7 @@
- 
- macro(add_lin_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack)
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_lin_executable)
- 
- IF(BUILD_SINGLE)
-Index: TESTING/EIG/CMakeLists.txt
-===================================================================
---- TESTING/EIG/CMakeLists.txt	(revision 1294)
-+++ TESTING/EIG/CMakeLists.txt	(working copy)
-@@ -119,7 +119,7 @@
- 
- macro(add_eig_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack )
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_eig_executable)
- 
- if (BUILD_SINGLE)
-Index: TESTING/MATGEN/CMakeLists.txt
-===================================================================
---- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
-+++ TESTING/MATGEN/CMakeLists.txt	(working copy)
-@@ -64,12 +64,12 @@
-   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
- endif()
- 
--list(REMOVE_DUPLICATES ALLOBJ)
--
- if (NOT ALLOBJ)
- set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
-   ${DZATGEN})
-+else()
-+  list(REMOVE_DUPLICATES ALLOBJ)
- endif()
- add_library(tmglib ${ALLOBJ} )
--target_link_libraries(tmglib lapack)
-+target_link_libraries(tmglib ${LAPACK_LIBRARIES})
- lapack_install_library(tmglib)

diff --git a/sci-libs/blas-reference/metadata.xml b/sci-libs/blas-reference/metadata.xml
index fc66d96..43c339b 100644
--- a/sci-libs/blas-reference/metadata.xml
+++ b/sci-libs/blas-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 BLAS (Basic Linear Algebra Subprograms) are high quality "building
   block" routines for performing basic vector and matrix operations. Level 1
   BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-05-23  5:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 20:01 [gentoo-commits] proj/sci:master commit in: sci-libs/blas-reference/, sci-libs/blas-reference/files/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2011-09-07 21:51 Sebastien Fabbro
2012-04-25 16:10 Sebastien Fabbro
2013-05-23  5:13 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox