public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/
@ 2011-08-19 14:16 Andrea Arteaga
  0 siblings, 0 replies; 5+ messages in thread
From: Andrea Arteaga @ 2011-08-19 14:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c17822347349f1d6aa4104c4ea66e0451d093a57
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Fri Aug 19 14:16:00 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Fri Aug 19 14:16:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c1782234

Added lapack-reference from bicatali overlay.

---
 sci-libs/lapack-reference/ChangeLog                |  281 ++++++++++++++++++++
 .../lapack-reference/files/3.3.1-blas-libs.patch   |   35 +++
 .../lapack-reference/files/3.3.1-xblas-libs.patch  |   44 +++
 .../lapack-reference-3.3.1-r1.ebuild               |   84 ++++++
 sci-libs/lapack-reference/metadata.xml             |   18 ++
 5 files changed, 462 insertions(+), 0 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
new file mode 100644
index 0000000..2c9db2e
--- /dev/null
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -0,0 +1,281 @@
+# ChangeLog for sci-libs/lapack-reference
+# 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 $
+
+  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.
+
+*lapack-reference-3.3.1-r1 (30 May 2011)
+
+  30 May 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -lapack-reference-3.3.1.ebuild, +lapack-reference-3.3.1-r1.ebuild:
+  Moved soname to libreflapack.so. Avoid collision in configure time with
+  sed's.
+
+*lapack-reference-3.3.1 (20 Apr 2011)
+
+  20 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.3.1-blas-libs.patch, -lapack-reference-3.3.0.ebuild,
+  +files/3.3.1-xblas-libs.patch, -files/3.3.0-cmake-install.patch,
+  +lapack-reference-3.3.1.ebuild:
+  Version bump. Fixed xblas linking.
+
+  23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  lapack-reference-3.3.0.ebuild:
+  Switched to alternatives-2 framework
+
+*lapack-reference-3.3.0 (20 Nov 2010)
+
+  20 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> -lapack-reference-3.2.2.ebuild,
+  -files/lapack-3.2.2-cmake-install.patch, +lapack-reference-3.3.0.ebuild,
+  +files/3.3.0-cmake-install.patch:
+  Version bump
+
+*lapack-reference-3.2.2 (13 Nov 2010)
+
+  13 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +lapack-rererence-3.2.2.ebuild,
+  +files/lapack-3.2.2-cmake-install.patch, +metadata.xml,
+  Version bump. Major cmake refactoring. blas is shipped with it so we now
+  respect upstream and do one single package for both blas and lapack
+
+  02 Oct 2010; Fabian Groffen <grobian@gentoo.org>
+  lapack-reference-3.2.1-r1.ebuild:
+  Marked ~x64-macos, bug #333981
+
+*lapack-reference-3.2.1-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +lapack-reference-3.2.1-r1.ebuild:
+  Moved to EAPI=3 for PREFIX support, imported prefix patches from overlay,
+  keyworded as in overlay
+
+  12 Dec 2009; Markus Dittrich <markusle@gentoo.org>
+  lapack-reference-3.2.1.ebuild,
+  +files/lapack-reference-3.2.1-parallel-make.patch:
+  Fixed parallel make failures in tests (see bug #295964).
+
+*lapack-reference-3.2.1 (13 Jul 2009)
+
+  13 Jul 2009; Markus Dittrich <markusle@gentoo.org>
+  +lapack-reference-3.2.1.ebuild:
+  Version bump. Since upstream currently only provides an unversioned tarball
+  we host a properly versioned one on our mirrors for the time being.
+
+  19 Dec 2007; Justin Bronder <jsbronder@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  Move ESELECT_PROF so binary packages work.
+
+  21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/lapack-reference-3.1.0-autotool.patch,
+  -files/lapack-reference-3.1.1-autotool.patch, -files/eselect-reference,
+  -lapack-reference-3.1.0.ebuild, -lapack-reference-3.1.1.ebuild,
+  lapack-reference-3.1.1-r1.ebuild:
+  Removed old versions, switch to new style virtual
+
+  20 Nov 2007; Joe Peterson <lavajoe@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  Add ~x86-fbsd keyword (bug #189738)
+
+  16 Nov 2007; nixnut <nixnut@gentoo.org> lapack-reference-3.1.1-r1.ebuild:
+  Stable on ppc wrt bug 189738
+
+  14 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  amd64 stable wrt #189738, with kingtaco's green light.
+
+  29 Oct 2007; Raúl Porcel <armin76@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  alpha stable wrt #189738
+
+  21 Oct 2007; nixnut <nixnut@gentoo.org> lapack-reference-3.1.1-r1.ebuild:
+  Added ~ppc
+
+  11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  fixed lib->get_libdir for eselect bug workaround
+
+  10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/lapack-reference-3.0-autotool.patch, -files/f77-reference,
+  -lapack-reference-3.0.ebuild, -lapack-reference-3.0-r1.ebuild,
+  lapack-reference-3.1.1-r1.ebuild:
+  Removed old versions, workaround for eselect bug #189942, cleanups.
+
+  08 Oct 2007; Markus Rothe <corsair@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  Stable on ppc64; bug #189738
+
+  27 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  ia64/sparc stable wrt #189738
+
+  13 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  stable x86, bug 189738
+
+  10 Sep 2007; Jeroen Roovers <jer@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild:
+  Stable for HPPA (bug #189738).
+
+*lapack-reference-3.1.1-r1 (21 Aug 2007)
+
+  21 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/lapack-reference-3.1.1-autotools.patch,
+  +files/eselect.lapack.reference, metadata.xml,
+  +lapack-reference-3.1.1-r1.ebuild:
+  New autotools patch to install pkg-config file and some cleanup. New eselect
+  file to add pkg-config. Added doc use flag to install generic docs, now
+  ready for new virtual style. Added longdescription in	metadata.xml. 
+  General cleanup.
+
+  25 Jul 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/lapack-reference-3.1.1-test-fix.patch,
+  lapack-reference-3.1.1.ebuild:
+  Added patch to disable testing of LS drivers since they hang for
+  some yet to be determined reason.
+
+  25 Jul 2007; Markus Dittrich <markusle@gentoo.org>
+  files/lapack-reference-3.1.1-autotool.patch:
+  Fixed issues due to missing ETIME intrinsic in >=gcc-4.2.
+
+  14 Jul 2007; Steve Arnold <nerdboy@gentoo.org>
+  lapack-reference-3.1.0.ebuild:
+  Added last multilib fix and marked stable for amd64 (see bug #171784).  I
+  still haven't tracked down the test issue; google reveals almost nothing.
+  It seems to be rare and only occurs on 64-bit platforms.  Reference:
+  https://icl.cs.utk.edu/lapack-forum/viewtopic.php?t=299
+
+  25 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  lapack-reference-3.1.1.ebuild:
+  Add ~alpha wrt #159002
+
+  07 Jun 2007; Joe Peterson <lavajoe@gentoo.org>
+  lapack-reference-3.1.1.ebuild:
+  Add ~x86-fbsd keyword
+
+  24 Mar 2007; nixnut <nixnut@gentoo.org> lapack-reference-3.1.0.ebuild:
+  Stable on ppc wrt bug 171784
+
+  24 Mar 2007; Markus Rothe <corsair@gentoo.org>
+  lapack-reference-3.1.0.ebuild:
+  Stable on ppc64; bug #171784
+
+  23 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  lapack-reference-3.1.0.ebuild:
+  stable x86, bug 171784
+
+  22 Mar 2007; Ferris McCormick <fmccor@gentoo.org>
+  lapack-reference-3.1.0.ebuild:
+  Sparc stable --- Bug #171784 --- builds, runs all tests successfully, and
+  installs as expected.
+
+  21 Mar 2007; Markus Dittrich <markusle@gentoo.org>
+  files/lapack-reference-3.1.0-autotool.patch:
+  Small fix to resolve as-needed issues.
+
+  13 Mar 2007; Danny van Dyk <kugelfang@gentoo.org>
+  lapack-reference-3.0.ebuild:
+  QA: which -> type -P
+
+*lapack-reference-3.1.1 (08 Mar 2007)
+
+  08 Mar 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/lapack-reference-3.1.1-autotool.patch,
+  -lapack-reference-3.0-r2.ebuild, -lapack-reference-3.0-r3.ebuild,
+  -lapack-reference-3.0-r4.ebuild, +lapack-reference-3.1.1.ebuild:
+  Version bump and removed obsolete versions.
+
+*lapack-reference-3.1.0 (04 Feb 2007)
+
+  04 Feb 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/lapack-reference-3.1.0-autotool.patch,
+  +lapack-reference-3.1.0.ebuild:
+  Version bump. Ebuild now allows library checks via lapack's 
+  test-routines. Thanks much to Adam Piątyszek 
+  <ediap@et.put.poznan.pl> for his ebuild and patches 
+  (this fixes bug #157410).
+
+  23 Jan 2007; Markus Dittrich <markusle@gentoo.org>
+  lapack-reference-3.0.ebuild, lapack-reference-3.0-r1.ebuild,
+  lapack-reference-3.0-r2.ebuild, lapack-reference-3.0-r3.ebuild,
+  lapack-reference-3.0-r4.ebuild:
+  Versioned the source tarballs according to the new upstream
+  naming convention (see bug #162667).
+
+  01 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+  Update for my nick change spyderous -> dberkholz.
+
+  24 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
+  lapack-reference-3.0-r1.ebuild:
+  Stable x86; bug #137033
+
+  11 Sep 2006; Ferris McCormick <fmccor@gentoo.org>
+  lapack-reference-3.0-r4.ebuild:
+  Add ~sparc keyword for completeness with other -reference packages.  Builds as
+  expected.
+
+  25 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/eselect-reference:
+  Add eselect symlink maps, reported by Markus Dittrich.
+
+  17 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  lapack-reference-3.0-r4.ebuild:
+  Note that configuration now uses eselect rather than lapack-config.
+
+*lapack-reference-3.0-r4 (03 Jul 2006)
+
+  03 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +lapack-reference-3.0-r4.ebuild:
+  Bumps to switch to new eselect modules.
+
+  18 Jun 2006; Markus Rothe <corsair@gentoo.org>
+  lapack-reference-3.0-r3.ebuild:
+  Added ~ppc64; bug #137033
+
+*lapack-reference-3.0-r3 (29 May 2006)
+
+  29 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/lapack-reference-3.0-autotool.patch,
+  +lapack-reference-3.0-r3.ebuild:
+  Bump to autotool the package, which makes the build work much better in
+  parallel and with gcc4. Thanks to Adam Piątyszek for catching an initial
+  problem; a couple of files cannot be compiled with optimization.
+
+  15 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  lapack-reference-3.0-r2.ebuild:
+  Keyword ~ppc.
+
+*lapack-reference-3.0-r2 (16 Nov 2005)
+
+  16 Nov 2005; Markus Dittrich <markusle@gentoo.org>
+  +lapack-reference-3.0-r2.ebuild:
+  Use libtool for linking shared libraries when compiling with ifc. 
+  This closes bug #112410
+
+*lapack-reference-3.0-r1 (13 Nov 2005)
+
+  13 Nov 2005; Olivier Fisette <ribosome@gentoo.org>
+  +lapack-reference-3.0-r1.ebuild:
+  Migrated to fortran.eclass (bug #65950).
+
+  22 Apr 2005; Danny van Dyk <kugelfang@gentoo.org>
+  lapack-reference-3.0.ebuild:
+  Marked stable on amd64.
+
+*lapack-reference-3.0 (29 Dec 2004)
+
+  29 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
+  +files/f77-reference, +lapack-reference-3.0.ebuild:
+  Moved from app-sci/lapack-reference to sci-libs/lapack-reference.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  lapack-reference-3.0.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org> lapack-reference-3.0.ebuild:
+  Fix use invocation
+
+  14 Jun 2004; George Shapovalov <george@gentoo.org> lapack-reference-3.0.ebuild, files/{digest-lapack-reference-3.0,f77-reference} :
+  initial release (#30463)
+  Full LAPACK implementation using the netlib reference implementation
+  ebuild submitted by Derek Dolney <dolney@astro.upenn.edu>

diff --git a/sci-libs/lapack-reference/files/3.3.1-blas-libs.patch b/sci-libs/lapack-reference/files/3.3.1-blas-libs.patch
new file mode 100644
index 0000000..95a640d
--- /dev/null
+++ b/sci-libs/lapack-reference/files/3.3.1-blas-libs.patch
@@ -0,0 +1,35 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 975)
++++ CMakeLists.txt	(working copy)
+@@ -68,24 +68,24 @@
+ option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
+ 
+ # Check the usage of the user provided BLAS libraries
+-if(BLAS_LIBRAIRIES)
++if(BLAS_LIBRARIES)
+   include(CheckFortranFunctionExists)
+-  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRAIRIES})
++  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
+   unset( CMAKE_REQUIRED_LIBRARIES )
+   if(BLAS_FOUND)
+-    message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRAIRIES}.")
++    message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
+   else(BLAS_FOUND)
+-    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRAIRIES}.")
++    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
+     message(ERROR "-->     Will use REFERENCE BLAS (by default)")
+-    message(ERROR "-->     Or Correct your BLAS_LIBRAIRIES entry ")
++    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
+     message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
+   endif(BLAS_FOUND)
+ 
+ # User did not provide a BLAS Library but specified to search for one
+ elseif( USE_OPTIMIZED_BLAS )
+   find_package( BLAS )
+-endif (BLAS_LIBRAIRIES)
++endif (BLAS_LIBRARIES)
+ 
+ # Neither user specified or optimized BLAS libraries can be used
+ if(NOT BLAS_FOUND)

diff --git a/sci-libs/lapack-reference/files/3.3.1-xblas-libs.patch b/sci-libs/lapack-reference/files/3.3.1-xblas-libs.patch
new file mode 100644
index 0000000..382529e
--- /dev/null
+++ b/sci-libs/lapack-reference/files/3.3.1-xblas-libs.patch
@@ -0,0 +1,44 @@
+Index: SRC/CMakeLists.txt
+===================================================================
+--- SRC/CMakeLists.txt	(revision 975)
++++ SRC/CMakeLists.txt	(working copy)
+@@ -373,7 +373,7 @@
+    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
+ 
+ 
+-if( USEXBLAS)
++if( USE_XBLAS)
+   set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
+ endif()
+ 
+@@ -392,5 +392,5 @@
+   set(ALLOBJ  ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+ endif()
+ add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack ${BLAS_LIBRARIES})
++target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ lapack_install_library(lapack)
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 975)
++++ CMakeLists.txt	(working copy)
+@@ -67,6 +67,7 @@
+ 
+ option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
+ 
++
+ # Check the usage of the user provided BLAS libraries
+ if(BLAS_LIBRAIRIES)
+   include(CheckFortranFunctionExists)
+@@ -103,6 +104,11 @@
+     "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+     CACHE STRING "Linker flags for shared libs" FORCE)
+ endif( NOT BLAS_FOUND )
++
++option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
++if (USE_XBLAS)
++  find_library(XBLAS_LIBRARY NAMES xblas)
++endif(USE_XBLAS)
+    
+ add_subdirectory(SRC)
+ if(BUILD_TESTING)

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
new file mode 100644
index 0000000..13e05e0
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild
@@ -0,0 +1,84 @@
+# 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/metadata.xml b/sci-libs/lapack-reference/metadata.xml
new file mode 100644
index 0000000..5cece89
--- /dev/null
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<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,
+  singular value decomposition, etc. It is a very comprehensive and
+  reputable package that has found extensive use in the scientific community.
+  This package installs the reference FORTRAN 77 implementation from
+  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>
+</pkgmetadata>



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

* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/
@ 2012-04-23 18:43 Sebastien Fabbro
  0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2012-04-23 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     18bc4fcc28acc0b87a0d00eccfd37ec5e5474fe8
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Apr 23 18:30:26 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 18:30:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=18bc4fcc

sci-libs/lapack-reference: Version bump

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

---
 sci-libs/lapack-reference/ChangeLog                |    7 +
 sci-libs/lapack-reference/files/3.4.1-cmake.patch  |  199 ++++++++++++++++++++
 .../lapack-reference/lapack-reference-3.4.0.ebuild |   79 --------
 ...215-r1.ebuild => lapack-reference-3.4.1.ebuild} |    4 +-
 4 files changed, 208 insertions(+), 81 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 3ea64cd..ac26cae 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.1 (23 Apr 2012)
+
+  23 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.4.1-cmake.patch, -lapack-reference-3.4.0.ebuild,
+  -lapack-reference-3.4.0_p20120215-r1.ebuild, +lapack-reference-3.4.1.ebuild:
+  Version bump
+
   23 Feb 2012; Justin Lecher <jlec@gentoo.org>
   lapack-reference-3.4.0_p20120215-r1.ebuild, metadata.xml:
   Keyworded for ~-linux prefix

diff --git a/sci-libs/lapack-reference/files/3.4.1-cmake.patch b/sci-libs/lapack-reference/files/3.4.1-cmake.patch
new file mode 100644
index 0000000..465f68a
--- /dev/null
+++ b/sci-libs/lapack-reference/files/3.4.1-cmake.patch
@@ -0,0 +1,199 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1284)
++++ 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 1284)
++++ 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 1284)
++++ 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 1284)
++++ 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 1284)
++++ 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 1284)
++++ TESTING/MATGEN/CMakeLists.txt	(working copy)
+@@ -71,5 +71,5 @@
+   ${DZATGEN})
+ 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/lapack-reference/lapack-reference-3.4.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.0.ebuild
deleted file mode 100644
index d7187cb..0000000
--- a/sci-libs/lapack-reference/lapack-reference-3.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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"
-}

diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
similarity index 92%
rename from sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
index 797a518..ad6c296 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.4.0_p20120215-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
@@ -9,8 +9,7 @@ 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"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -26,6 +25,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-cmake.patch
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 



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

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

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

sci-libs/lapack-reference: fixed patch for testing

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

---
 sci-libs/lapack-reference/ChangeLog                |    5 ++++
 ...{3.4.1-cmake.patch => lapack-3.4.1-cmake.patch} |   23 +++++++++++++------
 .../lapack-reference/lapack-reference-3.4.1.ebuild |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 200f273..7a860e5 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 $
 
+  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:
+  fixed patch for testing
+
   24 Apr 2012; Justin Lecher <jlec@gentoo.org> Manifest:
   Clean checksums
 

diff --git a/sci-libs/lapack-reference/files/3.4.1-cmake.patch b/sci-libs/lapack-reference/files/lapack-3.4.1-cmake.patch
similarity index 93%
rename from sci-libs/lapack-reference/files/3.4.1-cmake.patch
rename to sci-libs/lapack-reference/files/lapack-3.4.1-cmake.patch
index 465f68a..78dece8 100644
--- a/sci-libs/lapack-reference/files/3.4.1-cmake.patch
+++ b/sci-libs/lapack-reference/files/lapack-3.4.1-cmake.patch
@@ -1,6 +1,6 @@
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(revision 1284)
+--- CMakeLists.txt	(revision 1294)
 +++ CMakeLists.txt	(working copy)
 @@ -94,10 +94,6 @@
  # Precision to build
@@ -125,7 +125,7 @@ Index: CMakeLists.txt
  configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
 Index: lapacke/example/CMakeLists.txt
 ===================================================================
---- lapacke/example/CMakeLists.txt	(revision 1284)
+--- 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)
@@ -140,7 +140,7 @@ Index: lapacke/example/CMakeLists.txt
  add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
 Index: lapacke/CMakeLists.txt
 ===================================================================
---- lapacke/CMakeLists.txt	(revision 1284)
+--- lapacke/CMakeLists.txt	(revision 1294)
 +++ lapacke/CMakeLists.txt	(working copy)
 @@ -45,14 +45,14 @@
  
@@ -162,7 +162,7 @@ Index: lapacke/CMakeLists.txt
  
 Index: TESTING/LIN/CMakeLists.txt
 ===================================================================
---- TESTING/LIN/CMakeLists.txt	(revision 1284)
+--- TESTING/LIN/CMakeLists.txt	(revision 1294)
 +++ TESTING/LIN/CMakeLists.txt	(working copy)
 @@ -193,7 +193,7 @@
  
@@ -175,7 +175,7 @@ Index: TESTING/LIN/CMakeLists.txt
  IF(BUILD_SINGLE)
 Index: TESTING/EIG/CMakeLists.txt
 ===================================================================
---- TESTING/EIG/CMakeLists.txt	(revision 1284)
+--- TESTING/EIG/CMakeLists.txt	(revision 1294)
 +++ TESTING/EIG/CMakeLists.txt	(working copy)
 @@ -119,7 +119,7 @@
  
@@ -188,10 +188,19 @@ Index: TESTING/EIG/CMakeLists.txt
  if (BUILD_SINGLE)
 Index: TESTING/MATGEN/CMakeLists.txt
 ===================================================================
---- TESTING/MATGEN/CMakeLists.txt	(revision 1284)
+--- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
 +++ TESTING/MATGEN/CMakeLists.txt	(working copy)
-@@ -71,5 +71,5 @@
+@@ -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)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
index ad6c296..775e339 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-cmake.patch
+	epatch "${FILESDIR}"/${MYP}-cmake.patch
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 



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

* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/
@ 2015-12-03  9:55 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-12-03  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     97a8f7c1c9948ef28eb5a5c2466f0fd0f521d0dd
Author:     Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Wed Dec  2 19:29:37 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 19:29:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=97a8f7c1

sci-libs/lapack-reference: update pkg-config handling

 .../files/lapack-fix-build-system.patch            | 92 ++++++++++++++++++++++
 .../lapack-reference/lapack-reference-3.6.0.ebuild | 13 ++-
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/sci-libs/lapack-reference/files/lapack-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 0000000..8661709
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
++++ lapack-3.6.0/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
++++ lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
++++ lapack-3.6.0/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
++++ lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
++++ lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
++++ lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
++++ lapack-3.6.0/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+--- lapack-3.6.0/lapack.pc.in
++++ lapack-3.6.0/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapack
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

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 ac88f98..c06fe42 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.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
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 eutils
 
 MY_PN=lapack
 MYP=${MY_PN}-${PV}
@@ -32,10 +32,15 @@ DEPEND="${RDEPEND}
 	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
@@ -50,9 +55,9 @@ src_prepare() {
 		-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}:' \
+		-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 \


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

* [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/
@ 2017-02-03 10:25 Marius Brehler
  0 siblings, 0 replies; 5+ messages in thread
From: Marius Brehler @ 2017-02-03 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     483501fb94fe08de97627f08d04854cc9ae04e6e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 02:44:37 2017 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Fri Feb  3 02:44:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=483501fb

sci-libs/lapack-reference: version bump to 3.7.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../lapack-reference-3.7.0-fix-build-system.patch  |  56 ++++++++++
 .../lapack-reference-3.7.0-r100.ebuild             | 123 +++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
new file mode 100644
index 0000000..70f7cb0
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
@@ -0,0 +1,56 @@
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+index 7fd6f1e..e52f3ad 100644
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: BLAS
+ Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+index 4a938fe..311aed9 100644
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: CBLAS
+ Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+index 028f8da..dc092b1 100644
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+diff --git a/lapack.pc.in b/lapack.pc.in
+index 878efc2..2cca4c2 100644
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

diff --git a/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild b/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild
new file mode 100644
index 0000000..d3194a4
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="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-reference-${PV}-fix-build-system.patch" )
+
+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
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${blas_profname})"
+			-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] 5+ messages in thread

end of thread, other threads:[~2017-02-03 10:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23 18:43 [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2017-02-03 10:25 Marius Brehler
2015-12-03  9:55 Justin Lecher
2012-04-25 16:10 Sebastien Fabbro
2011-08-19 14:16 Andrea Arteaga

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