* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2011-08-22 19:26 Sebastien Fabbro
0 siblings, 0 replies; 7+ messages in thread
From: Sebastien Fabbro @ 2011-08-22 19:26 UTC (permalink / raw
To: gentoo-commits
commit: e3ba31c1f1b59363d9a646abad9b0b3c905fce00
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Aug 22 19:05:05 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 19:05:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3ba31c1
added gsl
---
sci-libs/gsl/ChangeLog | 374 +++++++++++++++++++++++++++
sci-libs/gsl/files/gsl-1.15-pkgconfig.patch | 16 ++
sci-libs/gsl/gsl-1.15-r1.ebuild | 42 +++
sci-libs/gsl/metadata.xml | 18 ++
4 files changed, 450 insertions(+), 0 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
new file mode 100644
index 0000000..3de2c01
--- /dev/null
+++ b/sci-libs/gsl/ChangeLog
@@ -0,0 +1,374 @@
+# ChangeLog for sci-libs/gsl
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+
+ 22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +gsl-1.15-r1.ebuild,
+ +files/gsl-1.15-pkgconfig.patch, +metadata.xml:
+ Imported from bicatali overlay
+
+*gsl-1.15-r1 (21 May 2011)
+
+ 21 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.14-r2.ebuild,
+ -files/gsl-1.14-pkgconfig.patch, +gsl-1.15-r1.ebuild,
+ +files/gsl-1.15-pkgconfig.patch:
+ Version bump
+
+ 23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.14-r2.ebuild:
+ Switched to alternatives-2 framework
+
+*gsl-1.14-r2 (09 Nov 2010)
+
+ 09 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +gsl-1.14-r2.ebuild,
+ +files/gsl-1.14-pkgconfig.patch, +metadata.xml:
+ Respect more upstream with respect to cblas. Do not depend on cblas at
+ compile time, only at run-time with the pkg-config utilities or gsl-config
+ and GSL_CBLAS_LIB environment variable. Install a gslcblas.pc pkg-config
+ file. Ebuild switched to autototools-utils eclass
+
+ 09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ -files/gsl-1.6-deps.diff, -files/gsl-1.12-cblas.patch, gsl-1.13-r1.ebuild,
+ gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, metadata.xml:
+ Renamed cblas to cblas-external wrt bug 330251. Dropped ~ppc-macos due to
+ unsolved deps. Remove old patches.
+
+ 18 Jul 2010; <nixnut@gentoo.org> gsl-1.14.ebuild:
+ ppc stable #325179
+
+ 18 Jul 2010; Raúl Porcel <armin76@gentoo.org> gsl-1.14.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #325179
+
+ 10 Jul 2010; Christian Faulhammer <fauli@gentoo.org> gsl-1.14.ebuild:
+ stable x86, bug 325179
+
+ 09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> gsl-1.14.ebuild:
+ ppc64 stable wrt #325179
+
+ 01 Jul 2010; Jeroen Roovers <jer@gentoo.org> gsl-1.14.ebuild:
+ Stable for HPPA (bug #325179).
+
+ 25 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.14-r1.ebuild:
+ Removed forced pic
+
+*gsl-1.14-r1 (25 Jun 2010)
+
+ 25 Jun 2010; Justin Lecher <jlec@gentoo.org> +gsl-1.14-r1.ebuild:
+ Include static lib support, force to pic
+
+ 24 Jun 2010; Pacho Ramos <pacho@gentoo.org> gsl-1.14.ebuild:
+ stable amd64, bug 325179
+
+ 09 Apr 2010; Markos Chandras <hwoarang@gentoo.org> gsl-1.13-r1.ebuild:
+ Stable on amd64 wrt bug #299826
+
+*gsl-1.14 (09 Apr 2010)
+
+ 09 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> +gsl-1.14.ebuild,
+ +files/gsl-1.14-cblas.patch:
+ Version bump
+
+*gsl-1.13-r2 (07 Mar 2010)
+
+ 07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +gsl-1.13-r2.ebuild:
+ Moved to EAPI=3 for PREFIX support, imported prefix patches from overlay,
+ keyworded as in overlay
+
+ 30 Jan 2010; Raúl Porcel <armin76@gentoo.org> gsl-1.13-r1.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #299826
+
+ 22 Jan 2010; Jeroen Roovers <jer@gentoo.org> gsl-1.13-r1.ebuild:
+ Stable for HPPA (bug #299826).
+
+ 12 Jan 2010; nixnut <nixnut@gentoo.org> gsl-1.13-r1.ebuild:
+ ppc stable #299826
+
+ 11 Jan 2010; Brent Baude <ranger@gentoo.org> gsl-1.13-r1.ebuild:
+ stable ppc64, bug 299826
+
+ 07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> gsl-1.13-r1.ebuild:
+ stable x86, bug 299826
+
+ 20 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org>
+ files/gsl-1.13-cblas-vars.patch:
+ Fix patch. Thanks to Livid
+
+*gsl-1.13-r1 (20 Sep 2009)
+
+ 20 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org> +gsl-1.13-r1.ebuild,
+ +files/gsl-1.13-cblas-vars.patch:
+ Fix bug #285468. Thanks to Livid
+
+*gsl-1.13 (17 Sep 2009)
+
+ 17 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.9.ebuild,
+ -gsl-1.11.ebuild, +gsl-1.13.ebuild, +files/gsl-1.13-cblas.patch,
+ -files/gsl-cblas.patch:
+ Version bump, removed old. Note gsl-1.9-r1 is kept for GPL-2 compat until
+ we close bug #199451
+
+ 23 Apr 2009; Raúl Porcel <armin76@gentoo.org> gsl-1.12.ebuild:
+ arm/ia64/s390/sh/sparc stable wrt #265339
+
+ 18 Apr 2009; Markus Meier <maekke@gentoo.org> gsl-1.12:
+ amd64/x86 stable, bug #265339
+
+ 15 Apr 2009; Brent Baude <ranger@gentoo.org> gsl-1.12.ebuild:
+ Marking gsl-1.12 ppc64 for bug 265339
+
+ 12 Apr 2009; Tobias Klausmann <klausman@gentoo.org> gsl-1.12.ebuild:
+ Stable on alpha, bug #265339
+
+ 11 Apr 2009; nixnut <nixnut@gentoo.org> gsl-1.12.ebuild:
+ ppc stable #265339
+
+ 08 Apr 2009; Jeroen Roovers <jer@gentoo.org> gsl-1.12.ebuild:
+ Stable for HPPA (bug #265339).
+
+ 20 Mar 2009; Peter Volkov <pva@gentoo.org> gsl-1.12.ebuild:
+ ~mips back, bug #204072
+
+*gsl-1.12 (19 Jan 2009)
+
+ 19 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/gsl-1.12-cblas.patch, -gsl-1.10.ebuild, +gsl-1.12.ebuild:
+ Version bump. cblas patch adapted and added a check on the external
+ cblas lib not to be gsl itself.
+
+ 09 Nov 2008; Raúl Porcel <armin76@gentoo.org> gsl-1.11.ebuild:
+ alpha/ia64 stable wrt #245838
+
+ 08 Nov 2008; Markus Meier <maekke@gentoo.org> gsl-1.11.ebuild:
+ amd64/x86 stable, bug #245838
+
+ 08 Nov 2008; nixnut <nixnut@gentoo.org> gsl-1.11.ebuild:
+ Stable on ppc wrt bug 245838
+
+ 07 Nov 2008; Jeroen Roovers <jer@gentoo.org> gsl-1.11.ebuild:
+ Stable for HPPA (bug #245838).
+
+ 06 Nov 2008; Ferris McCormick <fmccor@gentoo.org> gsl-1.11.ebuild:
+ Sparc stable --- Bug #245838 --- in use about 7 months w/o problems.
+
+ 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+ Add USE flag description to metadata wrt GLEP 56.
+
+*gsl-1.11 (31 Mar 2008)
+
+ 31 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.8.ebuild,
+ +gsl-1.11.ebuild:
+ Version bump. Removed icc test since it now compiles and tests are fine
+
+ 09 Jan 2008; Jeroen Roovers <jer@gentoo.org> gsl-1.9-r1.ebuild,
+ gsl-1.10.ebuild:
+ Marked ~hppa (bug #204072).
+
+ 02 Jan 2008; Raúl Porcel <armin76@gentoo.org> gsl-1.10.ebuild:
+ Re-add ~ia64
+
+ 11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.9-r1.ebuild,
+ gsl-1.10.ebuild:
+ fixed lib->get_libdir for eselect bug workaround
+
+*gsl-1.10 (10 Oct 2007)
+
+ 10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/gsl-cblas.patch, -gsl-1.4.ebuild, -gsl-1.6.ebuild, -gsl-1.7.ebuild,
+ gsl-1.9-r1.ebuild, +gsl-1.10.ebuild:
+ Version bump, removed old versions, added work around eselect bug #189942.
+ Added new cblas use flag to allow use of external cblas library.
+
+ 16 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+ files/eselect.cblas.gsl, metadata.xml:
+ fixed link for cblas.h, closing bug #192718, added longdescription.
+
+*gsl-1.9-r1 (21 Aug 2007)
+
+ 21 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +files/cblas.pc.in,
+ +files/eselect.cblas.gsl, +gsl-1.9-r1.ebuild:
+ Added eselect and cblas pkg-config files to be a possible implementation of
+ virtual/cblas. General cleanup continued.
+
+ 12 Jun 2007; Christoph Mende <angelos@gentoo.org> gsl-1.9.ebuild:
+ Stable on amd64 wrt bug 180916
+
+ 09 Jun 2007; nixnut <nixnut@gentoo.org> gsl-1.9.ebuild:
+ Stable on ppc wrt bug 180916
+
+ 07 Jun 2007; Markus Rothe <corsair@gentoo.org> gsl-1.9.ebuild:
+ Stable on ppc64; bug #180916
+
+ 06 Jun 2007; Raúl Porcel <armin76@gentoo.org> gsl-1.9.ebuild:
+ alpha/ia64/x86 stable wrt #180916
+
+ 05 Jun 2007; Jeroen Roovers <jer@gentoo.org> gsl-1.9.ebuild:
+ Stable for HPPA (bug #180916).
+
+ 05 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> gsl-1.9.ebuild:
+ Stable on sparc wrt #180916
+
+ 28 Mar 2007; Fabian Groffen <grobian@gentoo.org> gsl-1.7.ebuild,
+ gsl-1.8.ebuild, gsl-1.9.ebuild:
+ Dropped ppc-macos keyword, see you in prefix
+
+ 28 Mar 2007; Raúl Porcel <armin76@gentoo.org> gsl-1.8.ebuild:
+ ia64 stable wrt bug 167860
+
+ 27 Mar 2007; Michael Cummings <mcummings@gentoo.org> gsl-1.9.ebuild:
+ Tested on swarm for USE-flag changes in dev-perl/PDL
+
+ 15 Mar 2007; Markus Dittrich <markusle@gentoo.org> gsl-1.9.ebuild:
+ Some general clean-ups thanks to Santiago M. Mola Velasco
+ <cooldwind@gmail.com> (see bug #170919).
+
+ 06 Mar 2007; Simon Stelling <blubb@gentoo.org> gsl-1.8.ebuild:
+ stable on amd64; bug 169212
+
+ 28 Feb 2007; Roy Marples <uberlord@gentoo.org> gsl-1.9.ebuild:
+ Add ~x86-fbsd keyword.
+
+ 24 Feb 2007; nixnut <nixnut@gentoo.org> gsl-1.8.ebuild:
+ Stable on ppc wrt bug 167860
+
+ 24 Feb 2007; Markus Rothe <corsair@gentoo.org> gsl-1.8.ebuild:
+ Stable on ppc64; bug #167860
+
+ 22 Feb 2007; Christian Faulhammer <opfer@gentoo.org> gsl-1.8.ebuild:
+ stable x86; bug 167860
+
+ 22 Feb 2007; Jeroen Roovers <jer@gentoo.org> gsl-1.8.ebuild:
+ Stable for HPPA (bug #167860).
+
+*gsl-1.9 (21 Feb 2007)
+
+ 21 Feb 2007; Markus Dittrich <markusle@gentoo.org> +gsl-1.9.ebuild:
+ Version bump.
+
+ 21 Feb 2007; Markus Dittrich <markusle@gentoo.org> gsl-1.8.ebuild:
+ Removed filtering of -mfpmath=sse since otherwise tests fail
+ on a -mfpmath=sse built toolchain.
+
+ 06 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> gsl-1.8.ebuild:
+ Stable on sparc
+
+ 18 Jan 2007; Ferris McCormick <fmccor@gentoo.org> gsl-1.7.ebuild:
+ Stable on sparc (no problems reported for 15 months).
+
+ 01 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+ Update for my nick change spyderous -> dberkholz.
+
+ 17 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+ +files/gsl-1.6-deps.diff, gsl-1.8.ebuild:
+ (#134063) Fix for --as-needed.
+
+ 16 Jun 2006; Markus Rothe <corsair@gentoo.org> gsl-1.7.ebuild:
+ Stable on ppc64
+
+ 23 May 2006; Markus Rothe <corsair@gentoo.org> gsl-1.4.ebuild:
+ Stable on ppc64
+
+*gsl-1.8 (11 Apr 2006)
+
+ 11 Apr 2006; George Shapovalov <george@gentoo.org> +gsl-1.8.ebuild:
+ new version
+
+ 10 Mar 2006; Aron Griffis <agriffis@gentoo.org> gsl-1.7.ebuild:
+ Mark 1.7 stable on ia64
+
+ 22 Feb 2006; Emanuele Giaquinta <exg@gentoo.org> gsl-1.7.ebuild:
+ Stable on ppc.
+
+ 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> gsl-1.7.ebuild:
+ Mark 1.7 stable on alpha
+
+ 18 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> gsl-1.7.ebuild:
+ Stable on amd64.
+
+ 10 Nov 2005; Fabian Groffen <grobian@gentoo.org> gsl-1.7.ebuild:
+ Marked ~ppc-macos (bug #111578)
+
+*gsl-1.7 (14 Oct 2005)
+
+ 14 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> +gsl-1.7.ebuild:
+ Version bump, closes bug 106895.
+
+ 26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -files/k6-undef.diff,
+ -gsl-1.3.ebuild:
+ Removed obsolete version and unused patch.
+
+*gsl-1.6 (16 Jan 2005)
+
+ 16 Jan 2005; Olivier Fisette <ribosome@gentoo.org> gsl-1.3.ebuild,
+ gsl-1.4.ebuild, +gsl-1.6.ebuild:
+ New version. Fixed HOMEPAGE and SRC_URI (use the GNU mirrors).
+
+ 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+ Change encoding to UTF-8 for GLEP 31 compliance
+
+*gsl-1.4 (28 Dec 2004)
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
+ +files/k6-undef.diff, +gsl-1.3.ebuild, +gsl-1.4.ebuild:
+ Moved from dev-libs/gsl to sci-libs/gsl.
+
+ 23 Dec 2004; Markus Rothe <corsair@gentoo.org> gsl-1.4.ebuild:
+ Added ~ppc64 to KEYWORDS; bug #74046
+
+ 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gsl-1.3.ebuild,
+ gsl-1.4.ebuild:
+ virtual/glibc -> virtual/libc
+
+ 23 May 2004; Bryan Østergaard <kloeri@gentoo.org> gsl-1.4.ebuild:
+ Stable on alpha.
+
+ 02 May 2004; David Holm <dholm@gentoo.org> gsl-1.4.ebuild:
+ Added to ~ppc.
+
+ 14 Apr 2004; <kloeri@gentoo.org> gsl-1.4.ebuild:
+ Keyworded ~alpha.
+
+ 10 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> gsl-1.0.ebuild,
+ gsl-1.1.1.ebuild, gsl-1.2.ebuild, gsl-1.3.ebuild, gsl-1.4.ebuild:
+ Cleanup, bump to stable
+
+ 21 Nov 2003; George Shapovalov <george@gentoo.org> gsl-1.3.ebuild, gsl-1.4.ebuild :
+ added "filter-mpmath sse", fixes #33059
+
+*gsl-1.4 (18 Nov 2003)
+
+ 18 Nov 2003; Stephen Diener <sediener@gentoo.org> gsl-1.4.ebuild:
+ Version bump.
+
+ 13 Jun 2003; George Shapovalov <george@gentoo.org> gsl-1.3.ebuild :
+ added filter-flags -ffast-math (#22696), some cleanups.
+
+*gsl-1.1.1 (12 Jun 2003)
+
+ 12 Jun 2003; <msterret@gentoo.org> gsl-1.1.1.ebuild:
+ fix Header
+
+*gsl-1.3 (14 Feb 2003)
+
+ 14 Feb 2003; Martin Holzer <mholzer@gentoo.org> gsl-1.3.ebuild,
+ files/digest-gsl-1.3 ChangeLog :
+ Version bump. Closes #15665.
+
+*gsl-1.2 (06 Aug 2002)
+
+ 18 Oct 2002; George Shapovalov <george@gentoo.org> gsl-1.2.ebuild,
+ files/k6-undef.diff :
+
+ fix building on k6 systems. Thanks to Charles G. Waldman <cgw@alum.mit.edu>, #9011
+
+ 06 Aug 2002; George Shapovalov <george@gentoo.org> gsl-1.2.ebuild,
+ files/digest-gsl-1.2 :
+
+ new version, renaiming old ebuild sufficed
+
+*gsl-1.0 (1 Feb 2002)
+
+ 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+
+ Added initial ChangeLog which should be updated whenever the package is
+ updated in any way. This changelog is targetted to users. This means that the
+ comments should well explained and written in clean English. The details about
+ writing correct changelogs are explained in the skel.ChangeLog file which you
+ can find in the root directory of the portage repository.
diff --git a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
new file mode 100644
index 0000000..a29f461
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
@@ -0,0 +1,16 @@
+--- gsl.pc.in.orig 2011-05-21 15:14:23.000000000 +0100
++++ gsl.pc.in 2011-05-21 15:15:03.000000000 +0100
+@@ -2,10 +2,11 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
++
+
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
++Libs: @GSL_LIBS@ @GSL_LIBM@ @LIBS@
+ Cflags: @GSL_CFLAGS@
++Requires: cblas
diff --git a/sci-libs/gsl/gsl-1.15-r1.ebuild b/sci-libs/gsl/gsl-1.15-r1.ebuild
new file mode 100644
index 0000000..9d16780
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.15-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils autotools-utils alternatives-2
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
+
+src_install() {
+ autotools-utils_src_install
+ local libname=gslcblas
+
+ cat <<-EOF > ${libname}.pc
+ prefix=${EPREFIX}/usr
+ libdir=\${prefix}/$(get_libdir)
+ includedir=\${prefix}/include
+ Name: ${libname}
+ Description: ${DESCRIPTION} CBLAS implementation
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -l${libname}
+ Cflags: -I\${includedir}
+ EOF
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${libname}.pc
+ alternatives_for cblas gsl 0 \
+ /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \
+ /usr/include/cblas.h gsl/gsl_cblas.h
+}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
new file mode 100644
index 0000000..54ab246
--- /dev/null
+++ b/sci-libs/gsl/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 GNU Scientific Library (GSL) is a collection of routines for
+ numerical analysis. The routines are written from scratch by the GSL
+ team in C, and present a modern API for C programmers, while allowing
+ wrappers to be written for very high level languages.
+
+ GSL includes data types and routines for complex numbers, vectors,
+ matrices, basic linear algebra subroutines (BLAS), eigensystems,
+ simulated annealing, minimization, root finding, pseudo-random
+ numbers, least-squares fitting, fast Fourier transforms (FFT),
+ differential equations, quadrature, Monte Carlo integration, special
+ functions, physical constants, and much more.
+</longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2011-10-11 20:50 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-10-11 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 968c82e279a16e35c0b246ad7a161716a2f7dbe0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 20:50:11 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 20:50:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=968c82e2
Fix undefined symbols because of missing gslcblas lib during linking
(Portage version: 2.2.0_alpha66/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-libs/gsl/ChangeLog | 6 ++++++
sci-libs/gsl/files/gsl-1.15-cblas.patch | 17 +++++++++++++++++
.../gsl/{gsl-1.15-r1.ebuild => gsl-1.15-r2.ebuild} | 12 +++++++++---
sci-libs/gsl/metadata.xml | 4 ++--
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 3de2c01..20599ae 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+*gsl-1.15-r2 (11 Oct 2011)
+
+ 11 Oct 2011; Justin Lecher <jlec@gentoo.org> -gsl-1.15-r1.ebuild,
+ +gsl-1.15-r2.ebuild, +files/gsl-1.15-cblas.patch, metadata.xml:
+ Fix undefined symbols because of missing gslcblas lib during linking
+
22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +gsl-1.15-r1.ebuild,
+files/gsl-1.15-pkgconfig.patch, +metadata.xml:
Imported from bicatali overlay
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
new file mode 100644
index 0000000..a5d22e4
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -0,0 +1,17 @@
+ Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 327d2f3..acae2a3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,9 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+ libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
++libgsl_la_LDFLAGS += -no-undefined
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+
+ MINGW32_HOST = @MINGW32_HOST@
diff --git a/sci-libs/gsl/gsl-1.15-r1.ebuild b/sci-libs/gsl/gsl-1.15-r2.ebuild
similarity index 88%
rename from sci-libs/gsl/gsl-1.15-r1.ebuild
rename to sci-libs/gsl/gsl-1.15-r2.ebuild
index 9d16780..1367d6c 100644
--- a/sci-libs/gsl/gsl-1.15-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r2.ebuild
@@ -3,6 +3,7 @@
# $Header: $
EAPI=4
+
inherit eutils autotools-utils alternatives-2
DESCRIPTION="The GNU Scientific Library"
@@ -14,10 +15,15 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-pkgconfig.patch"
+ "${FILESDIR}/${P}-cblas.patch"
+ )
-PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
+src_prepare() {
+ autotools-utils_src_prepare
+ eautoreconf
+}
src_install() {
autotools-utils_src_install
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 54ab246..7c2d3cc 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/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 GNU Scientific Library (GSL) is a collection of routines for
numerical analysis. The routines are written from scratch by the GSL
team in C, and present a modern API for C programmers, while allowing
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2012-02-23 19:05 Sebastien Fabbro
0 siblings, 0 replies; 7+ messages in thread
From: Sebastien Fabbro @ 2012-02-23 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 92d6600a996226f07e14c886825151e6b72d4581
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 23 19:04:51 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 19:04:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=92d6600a
sci-libs/gsl: Fixed gsl-config/pkg-config issues
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/gsl/ChangeLog | 6 ++-
sci-libs/gsl/files/gsl-1.15-cblas.patch | 88 ++++++++++++++++++++++-----
sci-libs/gsl/files/gsl-1.15-pkgconfig.patch | 16 -----
sci-libs/gsl/gsl-1.15-r2.ebuild | 13 +---
4 files changed, 81 insertions(+), 42 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 20599ae..0f7636d 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/gsl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+ 23 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.15-r2.ebuild,
+ files/gsl-1.15-cblas.patch, -files/gsl-1.15-pkgconfig.patch:
+ Fixed gsl-config/pkg-config issues
+
*gsl-1.15-r2 (11 Oct 2011)
11 Oct 2011; Justin Lecher <jlec@gentoo.org> -gsl-1.15-r1.ebuild,
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
index a5d22e4..2ded784 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -1,17 +1,75 @@
- Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 327d2f3..acae2a3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,7 +20,9 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
- libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
-+libgsl_la_LDFLAGS += -no-undefined
- noinst_HEADERS = templates_on.h templates_off.h build.h
+diff -Nur gsl-1.15.orig/blas/Makefile.am gsl-1.15/blas/Makefile.am
+--- gsl-1.15.orig/blas/Makefile.am 2010-12-26 17:57:08.000000000 +0000
++++ gsl-1.15/blas/Makefile.am 2012-02-23 17:41:52.000000000 +0000
+@@ -5,7 +5,7 @@
+ INCLUDES = -I$(top_srcdir)
+
+ libgslblas_la_SOURCES = blas.c
+-
++libgslblas_la_LIBADD = $(top_builddir)/cblas/libgslcblas.la
+ #check_PROGRAMS = test
+ #TESTS = test
+ #test_LDADD = libgslblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
+diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
+--- gsl-1.15.orig/gsl-config.in 2010-12-26 17:57:08.000000000 +0000
++++ gsl-1.15/gsl-config.in 2012-02-23 17:47:30.000000000 +0000
+@@ -58,12 +58,11 @@
+ ;;
+
+ --cflags)
+- echo @GSL_CFLAGS@
++ echo @GSL_CFLAGS@ $(pkg-config --cflags cblas)
+ ;;
+
+ --libs)
+- : ${GSL_CBLAS_LIB=-lgslcblas}
+- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
++ echo $(pkg-config --libs gsl) @GSL_LIBM@
+ ;;
+
+ --libs-without-cblas)
+diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
+--- gsl-1.15.orig/gsl.pc.in 2011-01-31 16:59:17.000000000 +0000
++++ gsl-1.15/gsl.pc.in 2012-02-23 17:40:12.000000000 +0000
+@@ -2,10 +2,11 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
+
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
++Libs: @GSL_LIBS@
++Private: @GSL_LIBM@ @LIBS@
+ Cflags: @GSL_CFLAGS@
++Requires: cblas
+diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
+--- gsl-1.15.orig/Makefile.am 2011-04-14 16:13:48.000000000 +0100
++++ gsl-1.15/Makefile.am 2012-02-23 17:53:10.000000000 +0000
+@@ -25,7 +25,6 @@
MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+
+@@ -35,13 +34,13 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+-TESTS = test_gsl_histogram.sh pkgconfig.test
++TESTS = test_gsl_histogram.sh
+
+ #bin_PROGRAMS = main dummy
+ #dummy_SOURCES = version.c
diff --git a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
deleted file mode 100644
index a29f461..0000000
--- a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gsl.pc.in.orig 2011-05-21 15:14:23.000000000 +0100
-+++ gsl.pc.in 2011-05-21 15:15:03.000000000 +0100
-@@ -2,10 +2,11 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+
-
- Name: GSL
- Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
-+Libs: @GSL_LIBS@ @GSL_LIBM@ @LIBS@
- Cflags: @GSL_CFLAGS@
-+Requires: cblas
diff --git a/sci-libs/gsl/gsl-1.15-r2.ebuild b/sci-libs/gsl/gsl-1.15-r2.ebuild
index 1367d6c..87fbeeb 100644
--- a/sci-libs/gsl/gsl-1.15-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
+AUTOTOOLS_AUTORECONF=yes
inherit eutils autotools-utils alternatives-2
DESCRIPTION="The GNU Scientific Library"
@@ -15,15 +16,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
-PATCHES=(
- "${FILESDIR}/${P}-pkgconfig.patch"
- "${FILESDIR}/${P}-cblas.patch"
- )
-
-src_prepare() {
- autotools-utils_src_prepare
- eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
src_install() {
autotools-utils_src_install
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2013-08-19 23:33 Sebastien Fabbro
0 siblings, 0 replies; 7+ messages in thread
From: Sebastien Fabbro @ 2013-08-19 23:33 UTC (permalink / raw
To: gentoo-commits
commit: fb30a7bbb7c7aff3ccef1ddd0ce8a1e33833d892
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 23:00:19 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 23:00:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb30a7bb
sci-libs/gsl: Version bump
Package-Manager: portage-2.2.01.22288-prefix
RepoMan-Options: --force
---
sci-libs/gsl/ChangeLog | 7 +
...5-cblas.patch => gsl-1.16-cblas-external.patch} | 181 ++++++++++-----------
.../gsl/{gsl-1.15-r3.ebuild => gsl-1.16-r1.ebuild} | 13 +-
sci-libs/gsl/metadata.xml | 12 +-
4 files changed, 109 insertions(+), 104 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 786abee..f35223d 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+*gsl-1.16-r1 (19 Aug 2013)
+
+ 19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/gsl-1.16-cblas-external.patch, +gsl-1.16-r1.ebuild,
+ -files/gsl-1.15-cblas.patch, -gsl-1.15-r3.ebuild, metadata.xml:
+ sci-libs/gsl: Version bump
+
22 Feb 2013; Justin Lecher <jlec@gentoo.org> gsl-1.15-r3.ebuild,
metadata.xml:
Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
similarity index 64%
rename from sci-libs/gsl/files/gsl-1.15-cblas.patch
rename to sci-libs/gsl/files/gsl-1.16-cblas-external.patch
index dd402f3..7277aa4 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
@@ -1,38 +1,47 @@
-diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
---- gsl-1.15.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.15/acx_cblas.m4 2011-07-28 22:16:03.000000000 +0100
-@@ -0,0 +1,60 @@
-+AC_DEFUN([ACX_CBLAS],[
-+ use_cblas=no
-+ use_cblas_libs="-lcblas -lblas"
-+ use_cblas_cflags=""
+diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
+--- gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.000000000 -0800
++++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700
+@@ -0,0 +1,69 @@
++AC_DEFUN([AX_CBLAS],[
+
-+ AC_ARG_WITH(cblas,
-+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
++ ext_cblas=no
++ ext_cblas_libs="-lcblas"
++ ext_cblas_cflags=""
+
-+ case $with_cblas in
-+ yes) use_cblas=yes ;;
-+ no | "" ) use_cblas=no ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
-+ *) use_cblas_libs="-l$with_cblas" ;;
++ AC_ARG_WITH(cblas-external,
++ [AS_HELP_STRING([--with-cblas-external],
++ [Use external CBLAS library (default is no)])],
++ [with_ext_cblas=$withval],
++ [with_ext_cblas=no])
++
++ case $with_ext_cblas in
++ no) ext_cblas=no ;;
++ yes) ext_cblas=yes ;;
++ -* | */* | *.a | *.so | *.so.* | *.o)
++ ext_cblas=yes
++ ext_cblas_libs="$with_cblas" ;;
++ *) ext_cblas=yes
++ ext_cblas_libs="-l$with_cblas" ;;
+ esac
+
-+ AC_ARG_WITH(cblas-libs,
-+ [AS_HELP_STRING([--with-cblas-libs=<libs>],
-+ [external cblas libraries to link with (default is "$use_cblas_libs")])],
-+ [use_cblas_libs=$withval], [])
++ AC_ARG_WITH(cblas-external-libs,
++ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
++ [External cblas libraries to link with (default is "$ext_cblas_libs")])],
++ [ext_cblas_libs=$withval],
++ [])
+
-+ AC_ARG_WITH(cblas-cflags,
-+ [AS_HELP_STRING([--with-cblas-cflags=<flags>],
-+ [extra cflags to compile with external cblas ("-I<dir>")])],
-+ [use_cblas_cflags=$withval], [])
++ AC_ARG_WITH(cblas-external-cflags,
++ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
++ [Pre-processing flags to compile with external cblas ("-I<dir>")])],
++ [ext_cblas_cflags=$withval],
++ [])
+
-+ if test x$use_cblas != xno; then
++ if test x$ext_cblas != xno; then
+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$use_cblas_libs"
++ CBLAS_LIBS="$ext_cblas_libs"
+ fi
-+ if test "x$CBLAS_FLAGS" = x; then
-+ CBLAS_CFLAGS="$use_cblas_cflags"
++ if test "x$CBLAS_CFLAGS" = x; then
++ CBLAS_CFLAGS="$ext_cblas_cflags"
+ fi
+
+ CFLAGS_sav="$CFLAGS"
@@ -42,29 +51,29 @@ diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
+ *** Header file cblas.h not found.
+ *** If you installed cblas header in a non standard place,
+ *** specify its install prefix using the following option
-+ *** --with-cblas-cflags="-I<include_dir>"])
++ *** --with-cblas-external-cflags="-I<include_dir>"])
+ ])
+ CFLAGS="$CFLAGS_sav"
+
+ LIBS_sav="$LIBS"
+ LIBS="$LIBS $CBLAS_LIBS -lm"
+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes],
++ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
+ [AC_MSG_ERROR([
+ *** Linking with cblas with $LIBS failed.
+ *** If you installed cblas library in a non standard place,
+ *** specify its install prefix using the following option
-+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"])
++ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
+ ])
-+ AC_MSG_RESULT($use_cblas)
++ AC_MSG_RESULT($ext_cblas)
+ LIBS="$LIBS_sav"
-+ AC_SUBST(CBLAS_CFLAGS)
-+ AC_SUBST(CBLAS_LIBS)
++ AC_SUBST([CBLAS_CFLAGS])
++ AC_SUBST([CBLAS_LIBS])
+ fi
+])
-diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
---- gsl-1.15.orig/bspline/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/bspline/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
+--- gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700
@@ -12,6 +12,6 @@
TESTS = $(check_PROGRAMS)
@@ -73,15 +82,15 @@ diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
---- gsl-1.15.orig/configure.ac 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/configure.ac 2011-07-28 22:16:03.000000000 +0100
-@@ -190,6 +190,16 @@
+diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
+--- gsl-1.16.orig/configure.ac 2013-07-19 08:14:45.000000000 -0700
++++ gsl-1.16/configure.ac 2013-08-19 15:28:24.172640793 -0700
+@@ -191,6 +191,16 @@
AC_CHECK_LIB(m, cos)
fi
-+sinclude(acx_cblas.m4)
-+ACX_CBLAS
++sinclude(ax_cblas.m4)
++AX_CBLAS
+if test "x$CBLAS_LIBS" != "x"; then
+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
+else
@@ -93,9 +102,9 @@ diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
dnl Remember to put a definition in acconfig.h for each of these
AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
#include <fenv.h>])
-diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
---- gsl-1.15.orig/eigen/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/eigen/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
+--- gsl-1.16.orig/eigen/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/eigen/Makefile.am 2013-08-19 15:25:27.728497742 -0700
@@ -11,7 +11,7 @@
TESTS = $(check_PROGRAMS)
@@ -105,9 +114,9 @@ diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
---- gsl-1.15.orig/gsl-config.in 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/gsl-config.in 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
+--- gsl-1.16.orig/gsl-config.in 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl-config.in 2013-08-19 15:25:27.728497742 -0700
@@ -58,11 +58,11 @@
;;
@@ -122,9 +131,9 @@ diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
;;
-diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
---- gsl-1.15.orig/gsl.pc.in 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/gsl.pc.in 2011-07-28 22:20:14.000000000 +0100
+diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
+--- gsl-1.16.orig/gsl.pc.in 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl.pc.in 2013-08-19 15:25:27.728497742 -0700
@@ -2,7 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -134,9 +143,9 @@ diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
Name: GSL
Description: GNU Scientific Library
-diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
---- gsl-1.15.orig/interpolation/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/interpolation/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am
+--- gsl-1.16.orig/interpolation/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/interpolation/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -10,7 +10,7 @@
TESTS = $(check_PROGRAMS)
@@ -146,9 +155,9 @@ diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefil
test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
---- gsl-1.15.orig/linalg/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/linalg/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
+--- gsl-1.16.orig/linalg/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/linalg/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -12,7 +12,7 @@
check_PROGRAMS = test
@@ -158,9 +167,9 @@ diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
---- gsl-1.15.orig/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
+--- gsl-1.16.orig/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -19,13 +19,12 @@
lib_LTLIBRARIES = libgsl.la
@@ -198,23 +207,9 @@ diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
-e 's|@LIBS[@]|$(LIBS)|g' \
-e 's|@VERSION[@]|$(VERSION)|g'
-diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
---- gsl-1.15.orig/multifit/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multifit/Makefile.am 2011-07-28 22:16:03.000000000 +0100
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
-diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
---- gsl-1.15.orig/multimin/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multimin/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
+--- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -13,8 +13,8 @@
TESTS = $(check_PROGRAMS)
@@ -226,9 +221,9 @@ diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
---- gsl-1.15.orig/multiroots/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multiroots/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
+--- gsl-1.16.orig/multiroots/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multiroots/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -15,5 +15,5 @@
TESTS = $(check_PROGRAMS)
@@ -236,9 +231,9 @@ diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
---- gsl-1.15.orig/ode-initval/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/ode-initval/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am
+--- gsl-1.16.orig/ode-initval/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/ode-initval/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -12,7 +12,7 @@
TESTS = $(check_PROGRAMS)
@@ -248,9 +243,9 @@ diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
---- gsl-1.15.orig/poly/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/poly/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
+--- gsl-1.16.orig/poly/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/poly/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -10,7 +10,7 @@
TESTS = $(check_PROGRAMS)
@@ -259,10 +254,10 @@ diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
+#check_PROGRAMS = test
test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
---- gsl-1.15.orig/specfunc/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/specfunc/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
+diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
+--- gsl-1.16.orig/specfunc/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/specfunc/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -12,7 +12,7 @@
check_PROGRAMS = test
@@ -272,9 +267,9 @@ diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
---- gsl-1.15.orig/wavelet/Makefile.am 2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/wavelet/Makefile.am 2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
+--- gsl-1.16.orig/wavelet/Makefile.am 2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/wavelet/Makefile.am 2013-08-19 15:25:27.729497736 -0700
@@ -10,7 +10,7 @@
TESTS = $(check_PROGRAMS)
diff --git a/sci-libs/gsl/gsl-1.15-r3.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild
similarity index 88%
rename from sci-libs/gsl/gsl-1.15-r3.ebuild
rename to sci-libs/gsl/gsl-1.16-r1.ebuild
index 03159bd..fc67612 100644
--- a/sci-libs/gsl/gsl-1.15-r3.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r1.ebuild
@@ -2,13 +2,13 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_AUTORECONF=1
inherit alternatives-2 autotools-utils eutils toolchain-funcs
-DESCRIPTION="The GNU Scientific Library"
+DESCRIPTION="GNU Scientific Library"
HOMEPAGE="http://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -21,14 +21,16 @@ RDEPEND="cblas-external? ( virtual/cblas )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
src_configure() {
if use cblas-external; then
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
fi
+ local myeconfargs=(
+ $(use_with cblas-external)
+ )
autotools-utils_src_configure
}
@@ -45,6 +47,7 @@ src_install() {
Version: ${PV}
URL: ${HOMEPAGE}
Libs: -L\${libdir} -l${libname}
+ Libs.private: -lm
Cflags: -I\${includedir}
EOF
insinto /usr/$(get_libdir)/pkgconfig
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 7ab2ed0..9be87ca 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/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 GNU Scientific Library (GSL) is a collection of routines for
numerical analysis. The routines are written from scratch by the GSL
team in C, and present a modern API for C programmers, while allowing
@@ -15,8 +15,8 @@
differential equations, quadrature, Monte Carlo integration, special
functions, physical constants, and much more.
</longdescription>
- <use>
- <flag name="cblas-external">Link gsl with external cblas provided by
- (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
- </use>
+<use>
+ <flag name="cblas-external">Link gsl with external cblas provided by
+ (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2016-02-12 9:26 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2016-02-12 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 6e79edc188125e344b4edc354f1b9fc418561f71
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 09:25:59 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 09:25:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e79edc1
sci-libs/gsl: Version Bump
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 ++++++++++++++++++++++++
sci-libs/gsl/gsl-2.1.ebuild | 79 ++++++
sci-libs/gsl/metadata.xml | 3 +
3 files changed, 408 insertions(+)
diff --git a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
new file mode 100644
index 0000000..54cc880
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
@@ -0,0 +1,326 @@
+ Makefile.am | 8 +++---
+ ax_cblas.m4 | 69 +++++++++++++++++++++++++++++++++++++++++++++++
+ bspline/Makefile.am | 2 +-
+ configure.ac | 10 +++++++
+ eigen/Makefile.am | 2 +-
+ gsl-config.in | 4 +--
+ gsl.pc.in | 2 +-
+ interpolation/Makefile.am | 2 +-
+ linalg/Makefile.am | 2 +-
+ multifit/Makefile.am | 4 +--
+ multimin/Makefile.am | 4 +--
+ multiroots/Makefile.am | 2 +-
+ ode-initval/Makefile.am | 2 +-
+ poly/Makefile.am | 2 +-
+ specfunc/Makefile.am | 2 +-
+ wavelet/Makefile.am | 2 +-
+ 16 files changed, 100 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 278dcd9..a75418c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
+
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
++libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+
+@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
+ bin_PROGRAMS = gsl-randist gsl-histogram
+
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+ TESTS = test_gsl_histogram.sh pkgconfig.test
+@@ -51,6 +51,8 @@ edit = $(SED) \
+ -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
+ -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ -e 's|@LIBS[@]|$(LIBS)|g' \
+ -e 's|@VERSION[@]|$(VERSION)|g'
+
+diff --git a/ax_cblas.m4 b/ax_cblas.m4
+new file mode 100644
+index 0000000..6ef143a
+--- /dev/null
++++ b/ax_cblas.m4
+@@ -0,0 +1,69 @@
++AC_DEFUN([AX_CBLAS],[
++
++ ext_cblas=no
++ ext_cblas_libs="-lcblas"
++ ext_cblas_cflags=""
++
++ AC_ARG_WITH(cblas-external,
++ [AS_HELP_STRING([--with-cblas-external],
++ [Use external CBLAS library (default is no)])],
++ [with_ext_cblas=$withval],
++ [with_ext_cblas=no])
++
++ case $with_ext_cblas in
++ no) ext_cblas=no ;;
++ yes) ext_cblas=yes ;;
++ -* | */* | *.a | *.so | *.so.* | *.o)
++ ext_cblas=yes
++ ext_cblas_libs="$with_cblas" ;;
++ *) ext_cblas=yes
++ ext_cblas_libs="-l$with_cblas" ;;
++ esac
++
++ AC_ARG_WITH(cblas-external-libs,
++ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
++ [External cblas libraries to link with (default is "$ext_cblas_libs")])],
++ [ext_cblas_libs=$withval],
++ [])
++
++ AC_ARG_WITH(cblas-external-cflags,
++ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
++ [Pre-processing flags to compile with external cblas ("-I<dir>")])],
++ [ext_cblas_cflags=$withval],
++ [])
++
++ if test x$ext_cblas != xno; then
++ if test "x$CBLAS_LIBS" = x; then
++ CBLAS_LIBS="$ext_cblas_libs"
++ fi
++ if test "x$CBLAS_CFLAGS" = x; then
++ CBLAS_CFLAGS="$ext_cblas_cflags"
++ fi
++
++ CFLAGS_sav="$CFLAGS"
++ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++ AC_CHECK_HEADER(cblas.h, ,
++ [AC_MSG_ERROR([
++ *** Header file cblas.h not found.
++ *** If you installed cblas header in a non standard place,
++ *** specify its install prefix using the following option
++ *** --with-cblas-external-cflags="-I<include_dir>"])
++ ])
++ CFLAGS="$CFLAGS_sav"
++
++ LIBS_sav="$LIBS"
++ LIBS="$LIBS $CBLAS_LIBS -lm"
++ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
++ [AC_MSG_ERROR([
++ *** Linking with cblas with $LIBS failed.
++ *** If you installed cblas library in a non standard place,
++ *** specify its install prefix using the following option
++ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
++ ])
++ AC_MSG_RESULT($ext_cblas)
++ LIBS="$LIBS_sav"
++ AC_SUBST([CBLAS_CFLAGS])
++ AC_SUBST([CBLAS_LIBS])
++ fi
++])
+diff --git a/bspline/Makefile.am b/bspline/Makefile.am
+index 3f4f950..d413036 100644
+--- a/bspline/Makefile.am
++++ b/bspline/Makefile.am
+@@ -12,6 +12,6 @@ check_PROGRAMS = test
+
+ TESTS = $(check_PROGRAMS)
+
+-test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
++test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
+
+ test_SOURCES = test.c
+diff --git a/configure.ac b/configure.ac
+index d6b673f..c642454 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,6 +205,16 @@ if test "x$LIBS" = "x" ; then
+ AC_CHECK_LIB(m, cos)
+ fi
+
++sinclude(ax_cblas.m4)
++AX_CBLAS
++if test "x$CBLAS_LIBS" != "x"; then
++ CBLAS_LINK_LIBS="$CBLAS_LIBS"
++else
++ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
++ CBLAS_LIBS="-lgslcblas"
++fi
++AC_SUBST(CBLAS_LINK_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>])
+diff --git a/eigen/Makefile.am b/eigen/Makefile.am
+index c28bfde..14197a4 100644
+--- a/eigen/Makefile.am
++++ b/eigen/Makefile.am
+@@ -11,7 +11,7 @@ noinst_HEADERS = qrstep.c
+
+ TESTS = $(check_PROGRAMS)
+
+-test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
++test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+
+ test_SOURCES = test.c
+
+diff --git a/gsl-config.in b/gsl-config.in
+old mode 100755
+new mode 100644
+index 3f3fa61..c9c4262
+--- a/gsl-config.in
++++ b/gsl-config.in
+@@ -58,11 +58,11 @@ while test $# -gt 0; do
+ ;;
+
+ --cflags)
+- echo @GSL_CFLAGS@
++ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
+ ;;
+
+ --libs)
+- : ${GSL_CBLAS_LIB=-lgslcblas}
++ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+ echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
+ ;;
+
+diff --git a/gsl.pc.in b/gsl.pc.in
+index 5e9ef21..5a7a0f3 100644
+--- a/gsl.pc.in
++++ b/gsl.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
++GSL_CBLAS_LIB=@CBLAS_LIBS@
+
+ Name: GSL
+ Description: GNU Scientific Library
+diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
+index 1d80755..e45bd51 100644
+--- a/interpolation/Makefile.am
++++ b/interpolation/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
+
+ TESTS = $(check_PROGRAMS)
+
+-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ test_SOURCES = test.c
+
+diff --git a/linalg/Makefile.am b/linalg/Makefile.am
+index 8fb6e7c..90d22e0 100644
+--- a/linalg/Makefile.am
++++ b/linalg/Makefile.am
+@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
+
+ check_PROGRAMS = test
+
+-test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ test_SOURCES = test.c
+
+diff --git a/multifit/Makefile.am b/multifit/Makefile.am
+index 891964b..b33f71e 100644
+--- a/multifit/Makefile.am
++++ b/multifit/Makefile.am
+@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
+ TESTS = $(check_PROGRAMS)
+
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
+
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+
+diff --git a/multimin/Makefile.am b/multimin/Makefile.am
+index 7071359..65a488a 100644
+--- a/multimin/Makefile.am
++++ b/multimin/Makefile.am
+@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
+ TESTS = $(check_PROGRAMS)
+
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
+index a351c3f..6178448 100644
+--- a/multiroots/Makefile.am
++++ b/multiroots/Makefile.am
+@@ -15,5 +15,5 @@ check_PROGRAMS = test
+ TESTS = $(check_PROGRAMS)
+
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
+index 9c774b5..346c381 100644
+--- a/ode-initval/Makefile.am
++++ b/ode-initval/Makefile.am
+@@ -12,7 +12,7 @@ check_PROGRAMS = test
+
+ TESTS = $(check_PROGRAMS)
+
+-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ test_SOURCES = test.c
+
+diff --git a/poly/Makefile.am b/poly/Makefile.am
+index f1dae5d..e0f8e83 100644
+--- a/poly/Makefile.am
++++ b/poly/Makefile.am
+@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
+
+ TESTS = $(check_PROGRAMS)
+
+-check_PROGRAMS = test
++#check_PROGRAMS = test
+
+ test_SOURCES = test.c
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
+diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
+index 0a7e672..d1361d0 100644
+--- a/specfunc/Makefile.am
++++ b/specfunc/Makefile.am
+@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
+
+ check_PROGRAMS = test
+
+-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
+
+diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
+index 9da20d8..8cdbd77 100644
+--- a/wavelet/Makefile.am
++++ b/wavelet/Makefile.am
+@@ -10,7 +10,7 @@ check_PROGRAMS = test
+
+ TESTS = $(check_PROGRAMS)
+
+-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+
+ test_SOURCES = test.c
+
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
new file mode 100644
index 0000000..2a95c67
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+NUMERIC_MODULE_NAME="gsl"
+
+inherit autotools flag-o-matic numeric-int64-multibuild toolchain-funcs
+
+DESCRIPTION="GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+ numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+ gsl_configure() {
+ if use cblas-external; then
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+ fi
+ if numeric-int64_is_int64_build; then
+ append-fflags $(fortran_int64_abi_fflags)
+ fi
+ econf $(use_with cblas-external)
+ }
+ numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_configure
+}
+
+src_compile() {
+ numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
+}
+
+src_test() {
+ local MAKEOPTS="${MAKEOPTS} -j1"
+ numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
+}
+
+src_install() {
+ gsl_src_install() {
+ local profname=$(numeric-int64_get_module_name)
+ local libname="${profname//-/_}"
+
+ default
+
+ if ! numeric-int64_is_static_build; then
+ create_pkgconfig \
+ --name ${profname} \
+ --description "${DESCRIPTION} CBLAS implementation" \
+ --libs "-L\${libdir} -l${libname}" \
+ --libs-private "-lm" \
+ --cflags "-I\${includedir} $(numeric-int64_get_fortran_int64_abi_fflags)" \
+ ${profname}
+ fi
+
+ }
+ numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_src_install
+
+ printf "/usr/include/cblas.h ${PN}/cblas.h" > "${T}"/alternative-cblas-generic.sh || die
+
+ use cblas-external || \
+ numeric-int64-multibuild_install_alternative cblas ${NUMERIC_MODULE_NAME}
+}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 6e2e8e1..88a83b3 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -22,4 +22,7 @@
<flag name="cblas-external">Link gsl with external cblas provided by
(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
</use>
+ <use>
+ <flag name="int64">Build the 64 bits integer library</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2017-03-08 7:30 Marius Brehler
0 siblings, 0 replies; 7+ messages in thread
From: Marius Brehler @ 2017-03-08 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 69a4b2c57b5bcbb06dd7b6bd6f182abfe936fa6c
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Sat Mar 4 04:26:28 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Mar 7 18:59:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=69a4b2c5
sci-libs/gsl: remove int64 support since it doesn't exist upstream. Bump the ebuild as the current one produce broken install for the gslcblas alternative.
Package-Manager: portage-2.3.3
sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 1402 +----------------------
sci-libs/gsl/gsl-2.1-r1.ebuild | 82 ++
sci-libs/gsl/gsl-2.1.ebuild | 78 --
sci-libs/gsl/gsl-2.3-r1.ebuild | 84 ++
sci-libs/gsl/gsl-2.3.ebuild | 78 --
sci-libs/gsl/metadata.xml | 1 -
6 files changed, 175 insertions(+), 1550 deletions(-)
diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
index 7e12b370b..38b25aacc 100644
--- a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
+++ b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
@@ -1,36 +1,3 @@
- Makefile.am | 8 +-
- Makefile.am.porig | 66 ++++
- ax_cblas.m4 | 69 +++++
- bspline/Makefile.am | 2 +-
- bspline/Makefile.am.porig | 17 ++
- configure.ac | 10 +
- configure.ac.porig | 647 ++++++++++++++++++++++++++++++++++++++++
- eigen/Makefile.am | 2 +-
- eigen/Makefile.am.porig | 18 ++
- gsl-config.in | 4 +-
- gsl-config.in.porig | 80 +++++
- gsl.pc.in | 2 +-
- gsl.pc.in.porig | 11 +
- interpolation/Makefile.am | 2 +-
- interpolation/Makefile.am.porig | 18 ++
- linalg/Makefile.am | 2 +-
- linalg/Makefile.am.porig | 16 +
- multifit/Makefile.am | 4 +-
- multifit/Makefile.am.porig | 74 +++++
- multimin/Makefile.am | 4 +-
- multimin/Makefile.am.porig | 20 ++
- multiroots/Makefile.am | 2 +-
- multiroots/Makefile.am.porig | 19 ++
- ode-initval/Makefile.am | 2 +-
- ode-initval/Makefile.am.porig | 18 ++
- poly/Makefile.am | 2 +-
- poly/Makefile.am.porig | 17 ++
- specfunc/Makefile.am | 2 +-
- specfunc/Makefile.am.porig | 19 ++
- wavelet/Makefile.am | 2 +-
- wavelet/Makefile.am.porig | 17 ++
- 31 files changed, 1157 insertions(+), 19 deletions(-)
-
diff --git a/Makefile.am b/Makefile.am
index c522001..4513bc8 100644
--- a/Makefile.am
@@ -66,188 +33,6 @@ index c522001..4513bc8 100644
-e 's|@LIBS[@]|$(LIBS)|g' \
-e 's|@VERSION[@]|$(VERSION)|g'
-diff --git a/Makefile.am.porig b/Makefile.am.porig
-new file mode 100644
-index 0000000..c522001
---- /dev/null
-+++ b/Makefile.am.porig
-@@ -0,0 +1,66 @@
-+## Process this file with automake to produce Makefile.in
-+
-+# AUTOMAKE_OPTIONS = readme-alpha
-+
-+SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc
-+
-+SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgsls
pecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la
-+
-+pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h
-+
-+bin_SCRIPTS = gsl-config
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA= gsl.pc
-+
-+CLEANFILES = gsl.pc gsl-config
-+
-+EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spec.in gsl.m4 test_gsl_histogram.sh pkgconfig.test
-+
-+lib_LTLIBRARIES = libgsl.la
-+libgsl_la_SOURCES = version.c
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
-+noinst_HEADERS = templates_on.h templates_off.h build.h
-+
-+m4datadir = $(datadir)/aclocal
-+m4data_DATA = gsl.m4
-+
-+bin_PROGRAMS = gsl-randist gsl-histogram
-+
-+gsl_randist_SOURCES = gsl-randist.c
-+gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+
-+gsl_histogram_SOURCES = gsl-histogram.c
-+gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+
-+check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
-+TESTS = test_gsl_histogram.sh pkgconfig.test
-+
-+#bin_PROGRAMS = main dummy
-+#dummy_SOURCES = version.c
-+#dummy_LDADD = $(SUBLIBS)
-+#main_SOURCES = version.c env.c
-+#main_LDADD = libgsl.la
-+
-+edit = $(SED) \
-+ -e 's|@prefix[@]|$(prefix)|g' \
-+ -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
-+ -e 's|@libdir[@]|$(libdir)|g' \
-+ -e 's|@includedir[@]|$(includedir)|g' \
-+ -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
-+ -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
-+ -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@LIBS[@]|$(LIBS)|g' \
-+ -e 's|@VERSION[@]|$(VERSION)|g'
-+
-+gsl-config gsl.pc: Makefile
-+ @rm -f $@ $@.tmp
-+ @$(edit) '$(srcdir)/$@.in' >>$@.tmp
-+ @chmod a-w $@.tmp
-+ @mv $@.tmp $@
-+ @echo creating $@
-+
-+gsl-config: $(srcdir)/gsl-config.in
-+gsl.pc: $(srcdir)/gsl.pc.in
-+
-diff --git a/ax_cblas.m4 b/ax_cblas.m4
-new file mode 100644
-index 0000000..6ef143a
---- /dev/null
-+++ b/ax_cblas.m4
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+ [External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+ [Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I<include_dir>"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff --git a/bspline/Makefile.am b/bspline/Makefile.am
-index 3f4f950..d413036 100644
---- a/bspline/Makefile.am
-+++ b/bspline/Makefile.am
-@@ -12,6 +12,6 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES = test.c
-diff --git a/bspline/Makefile.am.porig b/bspline/Makefile.am.porig
-new file mode 100644
-index 0000000..3f4f950
---- /dev/null
-+++ b/bspline/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslbspline.la
-+
-+pkginclude_HEADERS = gsl_bspline.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslbspline_la_SOURCES = bspline.c greville.c
-+
-+noinst_HEADERS = bspline.h
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+
-+test_SOURCES = test.c
diff --git a/configure.ac b/configure.ac
index a26fc1e..564d426 100644
--- a/configure.ac
@@ -269,696 +54,17 @@ index a26fc1e..564d426 100644
dnl Remember to put a definition in acconfig.h for each of these
AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
#include <fenv.h>])
-diff --git a/configure.ac.porig b/configure.ac.porig
-new file mode 100644
-index 0000000..a26fc1e
---- /dev/null
-+++ b/configure.ac.porig
-@@ -0,0 +1,647 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_INIT([gsl],[2.3])
-+AC_CONFIG_SRCDIR(gsl_math.h)
-+
-+AM_INIT_AUTOMAKE([gnu])
-+AC_CONFIG_HEADERS([config.h])
-+AM_MAINTAINER_MODE
-+
-+dnl Library versioning (C:R:A == current:revision:age)
-+dnl See the libtool manual for an explanation of the numbers
-+dnl
-+dnl gsl-1.0 libgsl 0:0:0 libgslcblas 0:0:0
-+dnl gsl-1.1 libgsl 1:0:1 libgslcblas 0:0:0
-+dnl gsl-1.1.1 libgsl 2:0:2 libgslcblas 0:0:0
-+dnl gsl-1.2 libgsl 3:0:3 libgslcblas 0:0:0
-+dnl gsl-1.3 libgsl 4:0:4 libgslcblas 0:0:0
-+dnl gsl-1.4 libgsl 5:0:5 libgslcblas 0:0:0
-+dnl gsl-1.5 libgsl 6:0:6 libgslcblas 0:0:0
-+dnl gsl-1.6 libgsl 7:0:7 libgslcblas 0:0:0
-+dnl gsl-1.7 libgsl 8:0:8 libgslcblas 0:0:0
-+dnl gsl-1.8 libgsl 9:0:9 libgslcblas 0:0:0
-+dnl gsl-1.9 libgsl 10:0:10 libgslcblas 0:0:0
-+dnl gsl-1.10 libgsl 10:0:10 (*) libgslcblas 0:0:0
-+dnl gsl-1.11 libgsl 12:0:12 libgslcblas 0:0:0
-+dnl gsl-1.12 libgsl 13:0:13 libgslcblas 0:0:0
-+dnl gsl-1.13 libgsl 14:0:14 libgslcblas 0:0:0
-+dnl gsl-1.14 libgsl 15:0:15 libgslcblas 0:0:0
-+dnl gsl-1.15 libgsl 16:0:16 libgslcblas 0:0:0
-+dnl gsl-1.16 libgsl 17:0:17 libgslcblas 0:0:0
-+dnl gsl-2.0 libgsl 18:0:18 (**) libgslcblas 0:0:0
-+dnl gsl-2.1 libgsl 19:0:0 libgslcblas 0:0:0
-+dnl gsl-2.2 libgsl 20:0:1 libgslcblas 0:0:0
-+dnl gsl-2.2.1 libgsl 21:0:2 libgslcblas 0:0:0
-+dnl gsl-2.3 libgsl 22:0:3 libgslcblas 0:0:0
-+dnl
-+dnl (*) There was an error on this release. Firstly, the versioning
-+dnl numbers were not updated. Secondly, 2 functions were removed, but
-+dnl the age not reset--this should have been 11:0:0. However these
-+dnl functions were not documented and are regarded as internal, so we
-+dnl will assume 11:0:11.
-+dnl
-+dnl (**) There was an error on this release. Age should have been
-+dnl reset to 18:0:0
-+dnl
-+dnl How to update library version number
-+dnl ====================================
-+dnl
-+dnl C: increment if the interface has additions, changes, removals.
-+dnl
-+dnl R: increment any time the source changes; set to 0 if you
-+dnl incremented CURRENT
-+dnl
-+dnl A: increment if any interfaces have been added; set to 0 if any
-+dnl interfaces have been removed. removal has precedence over adding,
-+dnl so set to 0 if both happened.
-+dnl
-+dnl See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-+dnl for more detailed info
-+
-+dnl
-+GSL_CURRENT=22
-+GSL_REVISION=0
-+GSL_AGE=3
-+dnl
-+CBLAS_CURRENT=0
-+CBLAS_REVISION=0
-+CBLAS_AGE=0
-+
-+GSL_LT_VERSION="${GSL_CURRENT}:${GSL_REVISION}:${GSL_AGE}"
-+AC_SUBST(GSL_LT_VERSION)
-+
-+GSL_LT_CBLAS_VERSION="${CBLAS_CURRENT}:${CBLAS_REVISION}:${CBLAS_AGE}"
-+AC_SUBST(GSL_LT_CBLAS_VERSION)
-+
-+case "$VERSION" in
-+ *+)
-+ ;;
-+ *)
-+ AC_DEFINE(RELEASED,[],[Defined if this is an official release])
-+ ;;
-+esac
-+
-+dnl Split VERSION into GSL_VERSION_MAJOR and GSL_VERSION_MINOR
-+dnl Follows AX_SPLIT_VERSION macro from AC-Archive
-+dnl Rhys Ulerich <rhys.ulerich@gmail.com>
-+AC_PROG_SED
-+GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
-+GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-+AC_SUBST(GSL_MAJOR_VERSION)
-+AC_SUBST(GSL_MINOR_VERSION)
-+
-+dnl things required by automake
-+dnl AC_ARG_PROGRAM
-+AC_PROG_MAKE_SET
-+
-+dnl Check for which system.
-+AC_CANONICAL_HOST
-+
-+dnl Checks for programs.
-+AC_LANG(C)
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+LT_INIT([win32-dll])
-+
-+dnl Check compiler features
-+AC_TYPE_SIZE_T
-+dnl AC_C_CONST
-+AC_C_VOLATILE
-+AC_C_INLINE
-+AC_C_CHAR_UNSIGNED
-+
-+GSL_CFLAGS="-I$includedir"
-+GSL_LIBS="-L$libdir -lgsl"
-+dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2
-+LT_LIB_M
-+GSL_LIBM=$LIBM
-+
-+AC_SUBST(GSL_CFLAGS)
-+AC_SUBST(GSL_LIBS)
-+AC_SUBST(GSL_LIBM)
-+
-+if test "$ac_cv_c_inline" != no ; then
-+dnl Check for "extern inline", using a modified version of the test
-+dnl for AC_C_INLINE from acspecific.mt
-+dnl
-+ AC_CACHE_CHECK([for GNU-style extern inline], ac_cv_c_extern_inline,
-+ [ac_cv_c_extern_inline=no
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern $ac_cv_c_inline double foo(double x);
-+ extern $ac_cv_c_inline double foo(double x) { return x + 1.0 ; } ;
-+ double foo (double x) { return x + 1.0 ; };]], [[ foo(1.0) ]])],[ac_cv_c_extern_inline="yes"],[])
-+ ])
-+
-+ if test "$ac_cv_c_extern_inline" != no ; then
-+ AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
-+ else
-+ AC_CACHE_CHECK([for C99-style inline], ac_cv_c_c99inline,
-+ [ac_cv_c_c99inline=no
-+ dnl next line is a necessary condition
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern inline void* foo() { foo(); return &foo ; };]],
-+ [[ return foo() != 0 ]])],[ac_cv_c_c99inline="yes"],[])
-+ dnl but not sufficient, extern must work but inline on its own should not
-+ if test "$ac_cv_c_c99inline" != no ; then
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[inline void* foo() { foo(); return &foo ; };]],
-+ [[ return foo() != 0 ]])],[],ac_cv_c_c99inline="no")
-+ fi
-+ ])
-+ if test "$ac_cv_c_c99inline" != no ; then
-+ AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
-+ AC_DEFINE(HAVE_C99_INLINE,[1],[Define if you have inline with C99 behavior])
-+ fi
-+ fi
-+fi
-+
-+dnl Checks for header files.
-+AC_CHECK_HEADERS(ieeefp.h)
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+
-+case $host in
-+ *-*-cygwin* | *-*-mingw* )
-+ if test "$enable_shared" = yes; then
-+ GSLCBLAS_LDFLAGS="$GSLCBLAS_LDFLAGS -no-undefined"
-+ GSL_LDFLAGS="$GSL_LDFLAGS -no-undefined"
-+ GSL_LIBADD="cblas/libgslcblas.la"
-+ fi
-+ ;;
-+esac
-+
-+AC_SUBST(GSLCBLAS_LDFLAGS)
-+AC_SUBST(GSL_LDFLAGS)
-+AC_SUBST(GSL_LIBADD)
-+
-+dnl Checks for library functions.
-+
-+dnl AC_FUNC_ALLOCA
-+AC_FUNC_VPRINTF
-+
-+dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
-+dnl removed strerror from this list, it's hardcoded in the err/ directory
-+dnl Any functions which appear in this list of functions should be provided
-+dnl in the utils/ directory
-+dnl xmalloc is not used, removed (bjg)
-+AC_REPLACE_FUNCS(memcpy memmove strdup strtol strtoul)
-+
-+AC_CACHE_CHECK(for EXIT_SUCCESS and EXIT_FAILURE,
-+ac_cv_decl_exit_success_and_failure,
-+AC_EGREP_CPP(yes,
-+[
-+#include <stdlib.h>
-+#ifdef EXIT_SUCCESS
-+yes
-+#endif
-+],
-+ac_cv_decl_exit_success_and_failure=yes,
-+ac_cv_decl_exit_success_and_failure=no)
-+)
-+
-+if test "$ac_cv_decl_exit_success_and_failure" = yes ; then
-+ AC_DEFINE(HAVE_EXIT_SUCCESS_AND_FAILURE,1,[Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h])
-+fi ;
-+
-+dnl Use alternate libm if specified by user
-+
-+if test "x$LIBS" = "x" ; then
-+ AC_CHECK_LIB(m, cos)
-+fi
-+
-+dnl Remember to put a definition in acconfig.h for each of these
-+AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
-+#include <fenv.h>])
-+AC_CHECK_DECLS(fesettrapenable,,,[#define _GNU_SOURCE 1
-+#include <fenv.h>])
-+AC_CHECK_DECLS(hypot,,,[#include <math.h>])
-+AC_CHECK_DECLS(expm1,,,[#include <math.h>])
-+AC_CHECK_DECLS(acosh,,,[#include <math.h>])
-+AC_CHECK_DECLS(asinh,,,[#include <math.h>])
-+AC_CHECK_DECLS(atanh,,,[#include <math.h>])
-+AC_CHECK_DECLS(ldexp,,,[#include <math.h>])
-+AC_CHECK_DECLS(frexp,,,[#include <math.h>])
-+AC_CHECK_DECLS([fprnd_t],[],[],[[#include <float.h>]])
-+AC_CHECK_DECLS(isinf,,,[#include <math.h>])
-+AC_CHECK_DECLS(isfinite,,,[#include <math.h>])
-+AC_CHECK_DECLS(finite,,,[#include <math.h>
-+#if HAVE_IEEEFP_H
-+#include <ieeefp.h>
-+#endif])
-+AC_CHECK_DECLS(isnan,,,[#include <math.h>])
-+
-+dnl OpenBSD has a broken implementation of log1p.
-+case "$host" in
-+ *-*-*openbsd*)
-+ AC_MSG_RESULT([avoiding OpenBSD system log1p - using gsl version])
-+ ;;
-+ *)
-+ AC_CHECK_DECLS(log1p,,,[#include <math.h>])
-+ ;;
-+esac
-+
-+AC_CACHE_CHECK([for long double stdio], ac_cv_func_printf_longdouble,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <stdlib.h>
-+#include <stdio.h>
-+int main (void)
-+{
-+const char * s = "5678.25"; long double x = 1.234 ;
-+fprintf(stderr,"%Lg\n",x) ;
-+sscanf(s, "%Lg", &x);
-+if (x == 5678.25) {exit (0);} else {exit(1); };
-+}]])],[ac_cv_func_printf_longdouble="yes"],[ac_cv_func_printf_longdouble="no"],[ac_cv_func_printf_longdouble="no"])])
-+
-+if test "$ac_cv_func_printf_longdouble" != no; then
-+ AC_DEFINE(HAVE_PRINTF_LONGDOUBLE,1,[Define this if printf can handle %Lf for long double])
-+fi
-+
-+AC_CACHE_CHECK([for extended floating point registers],ac_cv_c_extended_fp,
-+[case "$host" in
-+ *sparc*-*-*)
-+ ac_cv_c_extended_fp=no
-+ ;;
-+ *powerpc*-*-*)
-+ ac_cv_c_extended_fp=no
-+ ;;
-+ *hppa*-*-*)
-+ ac_cv_c_extended_fp=no
-+ ;;
-+ *alpha*-*-*)
-+ ac_cv_c_extended_fp=no
-+ ;;
-+ *68k*-*-*)
-+ ac_cv_c_extended_fp=yes
-+ ;;
-+ *86-*-*)
-+ ac_cv_c_extended_fp=yes
-+ ;;
-+ x86_64-*-*)
-+ ac_cv_c_extended_fp=yes
-+ ;;
-+ *)
-+ ac_cv_c_extended_fp=unknown
-+ ;;
-+esac
-+])
-+
-+if test $ac_cv_c_extended_fp != "no" ; then
-+ AC_DEFINE(HAVE_EXTENDED_PRECISION_REGISTERS,1,[Defined on architectures with excess floating-point precision])
-+fi
-+
-+AC_CACHE_CHECK([for IEEE arithmetic interface type], ac_cv_c_ieee_interface,
-+[case "$host" in
-+ sparc-*-linux*)
-+ ac_cv_c_ieee_interface=gnusparc
-+ ;;
-+ m68k-*-linux*)
-+ ac_cv_c_ieee_interface=gnum68k
-+ ;;
-+ powerpc-*-linux*)
-+ ac_cv_c_ieee_interface=gnuppc
-+ ;;
-+ *86-*-gnu | *86_64-*-gnu | *86-*-linux* | *86_64-*-linux*)
-+ ac_cv_c_ieee_interface=gnux86
-+ ;;
-+ *-*-sunos4*)
-+ ac_cv_c_ieee_interface=sunos4
-+ ;;
-+ *-*-solaris*)
-+ ac_cv_c_ieee_interface=solaris
-+ ;;
-+ *-*-hpux11*)
-+ ac_cv_c_ieee_interface=hpux11
-+ ;;
-+ *-*-hpux*)
-+ ac_cv_c_ieee_interface=hpux
-+ ;;
-+ *-*-osf*)
-+ ac_cv_c_ieee_interface=tru64
-+ ;;
-+ *-*-aix*)
-+ ac_cv_c_ieee_interface=aix
-+ ;;
-+ *-*-irix*)
-+ ac_cv_c_ieee_interface=irix
-+ ;;
-+ powerpc-*-*darwin*)
-+ ac_cv_c_ieee_interface=darwin
-+ ;;
-+ *86-*-*darwin*)
-+ ac_cv_c_ieee_interface=darwin86
-+ ;;
-+ *-*-*netbsd*)
-+ ac_cv_c_ieee_interface=netbsd
-+ ;;
-+ *-*-*openbsd*)
-+ ac_cv_c_ieee_interface=openbsd
-+ ;;
-+ *-*-*bsd*)
-+ ac_cv_c_ieee_interface=freebsd
-+ ;;
-+ *-*-os2*)
-+ ac_cv_c_ieee_interface=os2emx
-+ ;;
-+ *)
-+ ac_cv_c_ieee_interface=unknown
-+ ;;
-+esac
-+])
-+
-+if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
-+ AC_CACHE_CHECK([for FPU_SETCW], ac_cv_c_fpu_setcw,
-+ [ac_cv_c_fpu_setcw=no
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fpu_control.h>
-+#ifndef _FPU_SETCW
-+#include <i386/fpu_control.h>
-+#define _FPU_SETCW(cw) __setfpucw(cw)
-+#endif
-+]], [[ unsigned short mode = 0 ; _FPU_SETCW(mode); ]])],[ac_cv_c_fpu_setcw="yes"],[ac_cv_c_ieee_interface=unknown])
-+ ])
-+fi
-+
-+if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
-+ AC_CACHE_CHECK([for SSE extensions], ac_cv_c_fpu_sse,
-+ [ac_cv_c_fpu_sse=no
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdlib.h>
-+#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
-+]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"],[
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdlib.h>
-+#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
-+]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"])
-+])])
-+
-+ if test $ac_cv_c_fpu_sse = yes; then
-+ AC_DEFINE([HAVE_FPU_X86_SSE], 1,
-+ [Define if x86 processor has sse extensions.])
-+ fi
-+fi
-+
-+ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE
-+AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type])
-+
-+AC_SUBST(HAVE_GNUSPARC_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUM68K_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUPPC_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUX86_IEEE_INTERFACE)
-+AC_SUBST(HAVE_SUNOS4_IEEE_INTERFACE)
-+AC_SUBST(HAVE_SOLARIS_IEEE_INTERFACE)
-+AC_SUBST(HAVE_HPUX11_IEEE_INTERFACE)
-+AC_SUBST(HAVE_HPUX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_TRU64_IEEE_INTERFACE)
-+AC_SUBST(HAVE_IRIX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_AIX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_FREEBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_OS2EMX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_NETBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_OPENBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
-+AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
-+
-+dnl Check for IEEE control flags
-+
-+save_cflags="$CFLAGS"
-+AC_CACHE_CHECK([for IEEE compiler flags], ac_cv_c_ieee_flags,
-+[
-+case "$host" in
-+ alpha*-*-*)
-+ if test X"$GCC" = Xyes ; then
-+ ieee_flags='-mieee -mfp-rounding-mode=d'
-+ else
-+ # This assumes Compaq's C compiler.
-+ ieee_flags='-ieee -fprm d'
-+ fi
-+ ;;
-+esac
-+if test X"$ieee_flags" != X ; then
-+ CFLAGS="$ieee_flags $CFLAGS"
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_ieee_flags="$ieee_flags"],[ac_cv_c_ieee_flags="none"])
-+else
-+ ac_cv_c_ieee_flags="none"
-+fi])
-+
-+if test "$ac_cv_c_ieee_flags" != "none" ; then
-+ CFLAGS="$ac_cv_c_ieee_flags $save_cflags"
-+else
-+ CFLAGS="$save_cflags"
-+fi
-+
-+dnl Check IEEE comparisons, whether "x != x" is true for NaNs
-+dnl
-+AC_CACHE_CHECK([for IEEE comparisons], ac_cv_c_ieee_comparisons,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <math.h>
-+int main (void)
-+{
-+ int status; double inf, nan;
-+ inf = exp(1.0e10);
-+ nan = inf / inf ;
-+ status = (nan == nan);
-+ exit (status);
-+}]])],[ac_cv_c_ieee_comparisons="yes"],[ac_cv_c_ieee_comparisons="no"],[ac_cv_c_ieee_comparisons="yes"])
-+])
-+
-+if test "$ac_cv_c_ieee_comparisons" != no ; then
-+ AC_DEFINE(HAVE_IEEE_COMPARISONS,1,[Define this if IEEE comparisons work correctly (e.g. NaN != NaN)])
-+fi
-+
-+dnl Check for IEEE denormalized arithmetic
-+dnl
-+AC_CACHE_CHECK([for IEEE denormalized values], ac_cv_c_ieee_denormals,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <math.h>
-+int main (void)
-+{
-+ int i, status;
-+ volatile double z = 1e-308;
-+ for (i = 0; i < 5; i++) { z = z / 10.0 ; };
-+ for (i = 0; i < 5; i++) { z = z * 10.0 ; };
-+ status = (z == 0.0);
-+ exit (status);
-+}]])],[ac_cv_c_ieee_denormals="yes"],[ac_cv_c_ieee_denormals="no"],[ac_cv_c_ieee_denormals="yes"])
-+])
-+
-+if test "$ac_cv_c_ieee_denormals" != no ; then
-+ AC_DEFINE(HAVE_IEEE_DENORMALS,1,[Define this if IEEE denormalized numbers are available])
-+fi
-+
-+AH_TEMPLATE([HIDE_INLINE_STATIC],[Define if you need to hide the static definitions of inline functions])
-+
-+AH_BOTTOM([/* Use 0 and 1 for EXIT_SUCCESS and EXIT_FAILURE if we don't have them */
-+#if !HAVE_EXIT_SUCCESS_AND_FAILURE
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
-+#endif])
-+
-+AH_BOTTOM([/* Define one of these if you have a known IEEE arithmetic interface */
-+#undef HAVE_GNUSPARC_IEEE_INTERFACE
-+#undef HAVE_GNUM68K_IEEE_INTERFACE
-+#undef HAVE_GNUPPC_IEEE_INTERFACE
-+#undef HAVE_GNUX86_IEEE_INTERFACE
-+#undef HAVE_SUNOS4_IEEE_INTERFACE
-+#undef HAVE_SOLARIS_IEEE_INTERFACE
-+#undef HAVE_HPUX11_IEEE_INTERFACE
-+#undef HAVE_HPUX_IEEE_INTERFACE
-+#undef HAVE_TRU64_IEEE_INTERFACE
-+#undef HAVE_IRIX_IEEE_INTERFACE
-+#undef HAVE_AIX_IEEE_INTERFACE
-+#undef HAVE_FREEBSD_IEEE_INTERFACE
-+#undef HAVE_OS2EMX_IEEE_INTERFACE
-+#undef HAVE_NETBSD_IEEE_INTERFACE
-+#undef HAVE_OPENBSD_IEEE_INTERFACE
-+#undef HAVE_DARWIN_IEEE_INTERFACE
-+#undef HAVE_DARWIN86_IEEE_INTERFACE])
-+
-+AH_BOTTOM([/* Define a rounding function which moves extended precision values
-+ out of registers and rounds them to double-precision. This should
-+ be used *sparingly*, in places where it is necessary to keep
-+ double-precision rounding for critical expressions while running in
-+ extended precision. For example, the following code should ensure
-+ exact equality, even when extended precision registers are in use,
-+
-+ double q = GSL_COERCE_DBL(3.0/7.0) ;
-+ if (q == GSL_COERCE_DBL(3.0/7.0)) { ... } ;
-+
-+ It carries a penalty even when the program is running in double
-+ precision mode unless you compile a separate version of the
-+ library with HAVE_EXTENDED_PRECISION_REGISTERS turned off. */
-+
-+#if HAVE_EXTENDED_PRECISION_REGISTERS
-+#define GSL_COERCE_DBL(x) (gsl_coerce_double(x))
-+#else
-+#define GSL_COERCE_DBL(x) (x)
-+#endif])
-+
-+AH_BOTTOM([/* Substitute gsl functions for missing system functions */
-+
-+#if !HAVE_DECL_HYPOT
-+#define hypot gsl_hypot
-+#endif
-+
-+#if !HAVE_DECL_LOG1P
-+#define log1p gsl_log1p
-+#endif
-+
-+#if !HAVE_DECL_EXPM1
-+#define expm1 gsl_expm1
-+#endif
-+
-+#if !HAVE_DECL_ACOSH
-+#define acosh gsl_acosh
-+#endif
-+
-+#if !HAVE_DECL_ASINH
-+#define asinh gsl_asinh
-+#endif
-+
-+#if !HAVE_DECL_ATANH
-+#define atanh gsl_atanh
-+#endif
-+
-+#if !HAVE_DECL_LDEXP
-+#define ldexp gsl_ldexp
-+#endif
-+
-+#if !HAVE_DECL_FREXP
-+#define frexp gsl_frexp
-+#endif
-+
-+#if !HAVE_DECL_ISINF
-+#define isinf gsl_isinf
-+#endif
-+
-+#if !HAVE_DECL_ISFINITE
-+#define isfinite gsl_finite
-+#endif
-+
-+#if !HAVE_DECL_FINITE
-+#define finite gsl_finite
-+#endif
-+
-+#if !HAVE_DECL_ISNAN
-+#define isnan gsl_isnan
-+#endif])
-+
-+AH_BOTTOM([#ifdef __GNUC__
-+#define DISCARD_POINTER(p) do { ; } while(p ? 0 : 0);
-+#else
-+#define DISCARD_POINTER(p) /* ignoring discarded pointer */
-+#endif])
-+
-+AH_BOTTOM([#if defined(GSL_RANGE_CHECK_OFF) || !defined(GSL_RANGE_CHECK)
-+#define GSL_RANGE_CHECK 0 /* turn off range checking by default internally */
-+#endif])
-+
-+AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }
-+])
-+
-+AH_VERBATIM([GSL_DISABLE_DEPRECATED],
-+[/* Disable deprecated functions and enums while building */
-+#define GSL_DISABLE_DEPRECATED 1])
-+
-+dnl
-+AC_CONFIG_FILES([ \
-+Makefile \
-+gsl_version.h \
-+gsl.spec \
-+blas/Makefile \
-+block/Makefile \
-+bspline/Makefile \
-+cblas/Makefile \
-+cdf/Makefile \
-+cheb/Makefile \
-+combination/Makefile \
-+complex/Makefile \
-+const/Makefile \
-+deriv/Makefile \
-+dht/Makefile \
-+diff/Makefile \
-+doc/Makefile \
-+doc/examples/Makefile \
-+eigen/Makefile \
-+err/Makefile \
-+fit/Makefile \
-+fft/Makefile \
-+gsl/Makefile \
-+histogram/Makefile \
-+ieee-utils/Makefile \
-+integration/Makefile \
-+interpolation/Makefile \
-+linalg/Makefile \
-+matrix/Makefile \
-+min/Makefile \
-+monte/Makefile \
-+multifit/Makefile \
-+multifit_nlinear/Makefile \
-+multilarge/Makefile \
-+multilarge_nlinear/Makefile \
-+multimin/Makefile \
-+multiroots/Makefile \
-+multiset/Makefile \
-+ntuple/Makefile \
-+ode-initval/Makefile \
-+ode-initval2/Makefile \
-+permutation/Makefile \
-+poly/Makefile \
-+qrng/Makefile \
-+randist/Makefile \
-+rng/Makefile \
-+roots/Makefile \
-+rstat/Makefile \
-+siman/Makefile \
-+sort/Makefile \
-+spblas/Makefile \
-+splinalg/Makefile \
-+spmatrix/Makefile \
-+specfunc/Makefile \
-+statistics/Makefile \
-+sum/Makefile \
-+sys/Makefile \
-+test/Makefile \
-+utils/Makefile \
-+vector/Makefile \
-+wavelet/Makefile \
-+])
-+
-+AC_OUTPUT
-diff --git a/eigen/Makefile.am b/eigen/Makefile.am
-index c28bfde..14197a4 100644
---- a/eigen/Makefile.am
-+++ b/eigen/Makefile.am
-@@ -11,7 +11,7 @@ noinst_HEADERS = qrstep.c
-
- TESTS = $(check_PROGRAMS)
+diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
+index f0dcc02..b2f0c0e 100644
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -8,5 +8,5 @@ examples_txt = blas.txt block.txt bspline.txt cblas.txt cdf.txt cheb.txt combina
--test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+ dist_noinst_DATA = $(examples_src) $(examples_txt)
- test_SOURCES = test.c
-
-diff --git a/eigen/Makefile.am.porig b/eigen/Makefile.am.porig
-new file mode 100644
-index 0000000..c28bfde
---- /dev/null
-+++ b/eigen/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgsleigen.la
-+
-+check_PROGRAMS = test
-+
-+pkginclude_HEADERS = gsl_eigen.h
-+libgsleigen_la_SOURCES = jacobi.c symm.c symmv.c nonsymm.c nonsymmv.c herm.c hermv.c gensymm.c gensymmv.c genherm.c genhermv.c gen.c genv.c sort.c francis.c schur.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+noinst_HEADERS = qrstep.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+
-+test_SOURCES = test.c
-+
-+
+-LDADD = ../../libgsl.la ../../cblas/libgslcblas.la
++LDADD = ../../libgsl.la @CBLAS_LINK_LIBS@
+ AM_DEFAULT_SOURCE_EXT = .c
diff --git a/gsl-config.in b/gsl-config.in
old mode 100755
new mode 100644
@@ -979,92 +85,6 @@ index 3f3fa61..c9c4262
echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
;;
-diff --git a/gsl-config.in.porig b/gsl-config.in.porig
-new file mode 100755
-index 0000000..3f3fa61
---- /dev/null
-+++ b/gsl-config.in.porig
-@@ -0,0 +1,80 @@
-+#! /bin/sh
-+
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: gsl-config [OPTION]
-+
-+Known values for OPTION are:
-+
-+ --prefix show GSL installation prefix
-+ --libs print library linking information, with cblas
-+ --libs-without-cblas print library linking information, without cblas
-+ --cflags print pre-processor and compiler flags
-+ --help display this help and exit
-+ --version output version information
-+
-+An external CBLAS library can be specified using the GSL_CBLAS_LIB
-+environment variable. The GSL CBLAS library is used by default.
-+
-+EOF
-+
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1
-+fi
-+
-+cflags=false
-+libs=false
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case "$1" in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+
-+ --prefix)
-+ echo $prefix
-+ ;;
-+
-+ --version)
-+ echo @VERSION@
-+ exit 0
-+ ;;
-+
-+ --help)
-+ usage 0
-+ ;;
-+
-+ --cflags)
-+ echo @GSL_CFLAGS@
-+ ;;
-+
-+ --libs)
-+ : ${GSL_CBLAS_LIB=-lgslcblas}
-+ echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
-+ ;;
-+
-+ --libs-without-cblas)
-+ echo @GSL_LIBS@ @GSL_LIBM@
-+ ;;
-+ *)
-+ usage
-+ exit 1
-+ ;;
-+ esac
-+ shift
-+done
-+
-+exit 0
diff --git a/gsl.pc.in b/gsl.pc.in
index 5e9ef21..5a7a0f3 100644
--- a/gsl.pc.in
@@ -1078,408 +98,4 @@ index 5e9ef21..5a7a0f3 100644
Name: GSL
Description: GNU Scientific Library
-diff --git a/gsl.pc.in.porig b/gsl.pc.in.porig
-new file mode 100644
-index 0000000..5e9ef21
---- /dev/null
-+++ b/gsl.pc.in.porig
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+GSL_CBLAS_LIB=-lgslcblas
-+
-+Name: GSL
-+Description: GNU Scientific Library
-+Version: @VERSION@
-+Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
-+Cflags: @GSL_CFLAGS@
-diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
-index 1d80755..e45bd51 100644
---- a/interpolation/Makefile.am
-+++ b/interpolation/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/interpolation/Makefile.am.porig b/interpolation/Makefile.am.porig
-new file mode 100644
-index 0000000..1d80755
---- /dev/null
-+++ b/interpolation/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgslinterpolation.la
-+
-+check_PROGRAMS = test
-+
-+pkginclude_HEADERS = gsl_interp.h gsl_spline.h gsl_interp2d.h gsl_spline2d.h
-+
-+libgslinterpolation_la_SOURCES = accel.c akima.c cspline.c interp.c linear.c integ_eval.h spline.c poly.c steffen.c inline.c interp2d.c bilinear.c bicubic.c spline2d.c
-+
-+noinst_HEADERS = test2d.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test.c
-+
-diff --git a/linalg/Makefile.am b/linalg/Makefile.am
-index a6c15b0..447ebbe 100644
---- a/linalg/Makefile.am
-+++ b/linalg/Makefile.am
-@@ -13,4 +13,4 @@ TESTS = $(check_PROGRAMS)
- check_PROGRAMS = test
-
- test_SOURCES = test.c
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-diff --git a/linalg/Makefile.am.porig b/linalg/Makefile.am.porig
-new file mode 100644
-index 0000000..a6c15b0
---- /dev/null
-+++ b/linalg/Makefile.am.porig
-@@ -0,0 +1,16 @@
-+noinst_LTLIBRARIES = libgsllinalg.la
-+
-+pkginclude_HEADERS = gsl_linalg.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgsllinalg_la_SOURCES = cod.c condest.c invtri.c multiply.c exponential.c tridiag.c tridiag.h lu.c luc.c hh.c qr.c qrpt.c lq.c ptlq.c svd.c householder.c householdercomplex.c hessenberg.c hesstri.c cholesky.c choleskyc.c mcholesky.c pcholesky.c symmtd.c hermtd.c bidiag.c balance.c balancemat.c inline.c
-+
-+noinst_HEADERS = apply_givens.c cholesky_common.c svdstep.c tridiag.h test_cholesky.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_SOURCES = test.c
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-diff --git a/multifit/Makefile.am b/multifit/Makefile.am
-index 988614e..793b485 100644
---- a/multifit/Makefile.am
-+++ b/multifit/Makefile.am
-@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
-diff --git a/multifit/Makefile.am.porig b/multifit/Makefile.am.porig
-new file mode 100644
-index 0000000..988614e
---- /dev/null
-+++ b/multifit/Makefile.am.porig
-@@ -0,0 +1,74 @@
-+noinst_LTLIBRARIES = libgslmultifit.la
-+
-+pkginclude_HEADERS = gsl_multifit.h gsl_multifit_nlin.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultifit_la_SOURCES = gcv.c multilinear.c multiwlinear.c work.c lmniel.c lmder.c fsolver.c fdfsolver.c fdfridge.c fdjac.c convergence.c gradient.c covar.c multirobust.c robust_wfun.c multireg.c
-+
-+noinst_HEADERS = \
-+linear_common.c \
-+lmutil.c \
-+lmpar.c \
-+lmset.c \
-+lmiterate.c \
-+lmmisc.c \
-+qrsolv.c \
-+test_bard.c \
-+test_beale.c \
-+test_biggs.c \
-+test_box.c \
-+test_boxbod.c \
-+test_brown1.c \
-+test_brown2.c \
-+test_brown3.c \
-+test_eckerle.c \
-+test_enso.c \
-+test_estimator.c \
-+test_exp1.c \
-+test_filip.c \
-+test_gaussian.c \
-+test_hahn1.c \
-+test_helical.c \
-+test_jennrich.c \
-+test_kirby2.c \
-+test_kowalik.c \
-+test_lin1.c \
-+test_lin2.c \
-+test_lin3.c \
-+test_linear.c \
-+test_longley.c \
-+test_meyer.c \
-+test_meyerscal.c \
-+test_nelson.c \
-+test_nonlinear.c \
-+test_osborne.c \
-+test_penalty1.c \
-+test_penalty2.c \
-+test_pontius.c \
-+test_powell1.c \
-+test_powell2.c \
-+test_powell3.c \
-+test_rat42.c \
-+test_rat43.c \
-+test_reg.c \
-+test_rosenbrock.c \
-+test_rosenbrocke.c \
-+test_roth.c \
-+test_shaw.c \
-+test_thurber.c \
-+test_vardim.c \
-+test_watson.c \
-+test_wnlin.c \
-+test_wood.c
-+
-+check_PROGRAMS = test #demo
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_SOURCES = test.c
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
-+
-+#demo_SOURCES = demo.c
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+
-diff --git a/multimin/Makefile.am b/multimin/Makefile.am
-index 7071359..65a488a 100644
---- a/multimin/Makefile.am
-+++ b/multimin/Makefile.am
-@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff --git a/multimin/Makefile.am.porig b/multimin/Makefile.am.porig
-new file mode 100644
-index 0000000..7071359
---- /dev/null
-+++ b/multimin/Makefile.am.porig
-@@ -0,0 +1,20 @@
-+noinst_LTLIBRARIES = libgslmultimin.la
-+
-+pkginclude_HEADERS = gsl_multimin.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultimin_la_SOURCES = fdfminimizer.c steepest_descent.c conjugate_fr.c conjugate_pr.c convergence.c diff.c vector_bfgs.c vector_bfgs2.c fminimizer.c simplex.c simplex2.c
-+
-+noinst_HEADERS = directional_minimize.c linear_minimize.c linear_wrapper.c
-+
-+check_PROGRAMS = test #demo
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_SOURCES = test.c test_funcs.c test_funcs.h
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+#demo_SOURCES = demo.c
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
-index a351c3f..6178448 100644
---- a/multiroots/Makefile.am
-+++ b/multiroots/Makefile.am
-@@ -15,5 +15,5 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff --git a/multiroots/Makefile.am.porig b/multiroots/Makefile.am.porig
-new file mode 100644
-index 0000000..a351c3f
---- /dev/null
-+++ b/multiroots/Makefile.am.porig
-@@ -0,0 +1,19 @@
-+# -*-makefile-*-
-+
-+noinst_LTLIBRARIES = libgslmultiroots.la
-+
-+pkginclude_HEADERS = gsl_multiroots.h
-+
-+noinst_HEADERS = enorm.c dogleg.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultiroots_la_SOURCES = fdjac.c fsolver.c fdfsolver.c convergence.c newton.c gnewton.c dnewton.c broyden.c hybrid.c hybridj.c
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_SOURCES = test.c test_funcs.c test_funcs.h
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
-index 9c774b5..346c381 100644
---- a/ode-initval/Makefile.am
-+++ b/ode-initval/Makefile.am
-@@ -12,7 +12,7 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/ode-initval/Makefile.am.porig b/ode-initval/Makefile.am.porig
-new file mode 100644
-index 0000000..9c774b5
---- /dev/null
-+++ b/ode-initval/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgslodeiv.la
-+
-+pkginclude_HEADERS = gsl_odeiv.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslodeiv_la_SOURCES = control.c cstd.c cscal.c evolve.c step.c rk2.c rk2imp.c rk2simp.c rk4.c rk4imp.c rkf45.c rk8pd.c rkck.c bsimp.c gear1.c gear2.c
-+
-+noinst_HEADERS = odeiv_util.h
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test.c
-+
-diff --git a/poly/Makefile.am b/poly/Makefile.am
-index f1dae5d..e0f8e83 100644
---- a/poly/Makefile.am
-+++ b/poly/Makefile.am
-@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
-
- TESTS = $(check_PROGRAMS)
-
--check_PROGRAMS = test
-+#check_PROGRAMS = test
-
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff --git a/poly/Makefile.am.porig b/poly/Makefile.am.porig
-new file mode 100644
-index 0000000..f1dae5d
---- /dev/null
-+++ b/poly/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslpoly.la
-+
-+pkginclude_HEADERS = gsl_poly.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslpoly_la_SOURCES = dd.c eval.c solve_quadratic.c solve_cubic.c zsolve_quadratic.c zsolve_cubic.c zsolve.c zsolve_init.c deriv.c
-+
-+noinst_HEADERS = balance.c companion.c qr.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_SOURCES = test.c
-+test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-+
-diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
-index eba9ab2..772cc7e 100644
---- a/specfunc/Makefile.am
-+++ b/specfunc/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
-
- check_PROGRAMS = test
-
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-
-diff --git a/specfunc/Makefile.am.porig b/specfunc/Makefile.am.porig
-new file mode 100644
-index 0000000..eba9ab2
---- /dev/null
-+++ b/specfunc/Makefile.am.porig
-@@ -0,0 +1,19 @@
-+noinst_LTLIBRARIES = libgslspecfunc.la
-+
-+pkginclude_HEADERS = gsl_sf.h gsl_sf_airy.h gsl_sf_bessel.h gsl_sf_clausen.h gsl_sf_coulomb.h gsl_sf_coupling.h gsl_sf_dawson.h gsl_sf_debye.h gsl_sf_dilog.h gsl_sf_elementary.h gsl_sf_ellint.h gsl_sf_elljac.h gsl_sf_erf.h gsl_sf_exp.h gsl_sf_expint.h gsl_sf_fermi_dirac.h gsl_sf_gamma.h gsl_sf_gegenbauer.h gsl_sf_hyperg.h gsl_sf_laguerre.h gsl_sf_lambert.h gsl_sf_legendre.h gsl_sf_log.h gsl_sf_mathieu.h gsl_sf_pow_int.h gsl_sf_psi.h gsl_sf_result.h gsl_sf_synchrotron.h gsl_sf_transport.h gsl_sf_trig.h gsl_sf_zeta.h gsl_specfunc.h
-+
-+noinst_HEADERS = bessel_amp_phase.h bessel_olver.h bessel_temme.h bessel.h hyperg.h legendre.h eval.h chebyshev.h cheb_eval.c cheb_eval_mode.c check.h error.h legendre_source.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslspecfunc_la_SOURCES = airy.c airy_der.c airy_zero.c atanint.c bessel.c bessel.h bessel_I0.c bessel_I1.c bessel_In.c bessel_Inu.c bessel_J0.c bessel_J1.c bessel_Jn.c bessel_Jnu.c bessel_K0.c bessel_K1.c bessel_Kn.c bessel_Knu.c bessel_Y0.c bessel_Y1.c bessel_Yn.c bessel_Ynu.c bessel_amp_phase.c bessel_amp_phase.h bessel_i.c bessel_j.c bessel_k.c bessel_olver.c bessel_temme.c bessel_y.c bessel_zero.c bessel_sequence.c beta.c beta_inc.c clausen.c coulomb.c coupling.c coulomb_bound.c dawson.c debye.c dilog.c elementary.c ellint.c elljac.c erfc.c exp.c expint.c expint3.c fermi_dirac.c gegenbauer.c gamma.c gamma_inc.c hyperg_0F1.c hyperg_2F0.c hyperg_1F1.c hyperg_2F1.c hyperg_U.c hyperg.c laguerre.c lambert.c legendre_H3d.c legendre_P.c legendre_Qn.c legendre_con.c legendre_poly.c log.c mathieu_angfunc.c mathieu_charv.c mathieu_coeff.c mathieu_radfunc.c mathieu_workspace.c poch.c pow_int.c psi.c recurse.h result.c shint.c sinint.c synchrotron.c transport.c trig.c zeta.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-+
-+
-diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
-index 9da20d8..8cdbd77 100644
---- a/wavelet/Makefile.am
-+++ b/wavelet/Makefile.am
-@@ -10,7 +10,7 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/wavelet/Makefile.am.porig b/wavelet/Makefile.am.porig
-new file mode 100644
-index 0000000..9da20d8
---- /dev/null
-+++ b/wavelet/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslwavelet.la
-+
-+pkginclude_HEADERS = gsl_wavelet.h gsl_wavelet2d.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslwavelet_la_SOURCES = dwt.c wavelet.c bspline.c daubechies.c haar.c
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test.c
-+
-+
diff --git a/sci-libs/gsl/gsl-2.1-r1.ebuild b/sci-libs/gsl/gsl-2.1-r1.ebuild
new file mode 100644
index 000000000..b26a45748
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
+
+DESCRIPTION="GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/19"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+ multilib_copy_sources
+}
+
+src_configure() {
+ gsl_configure() {
+ cd "${BUILD_DIR}"
+ if use cblas-external; then
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+ fi
+ econf $(use_with cblas-external)
+ }
+ multilib_foreach_abi gsl_configure
+}
+
+src_compile() {
+ gsl_compile() {
+ cd "${BUILD_DIR}"
+ default
+ }
+ multilib_foreach_abi gsl_compile
+}
+
+src_test() {
+ gsl_test() {
+ cd "${BUILD_DIR}"
+ default
+ }
+ multilib_foreach_abi gsl_test
+}
+
+src_install() {
+ gsl_install() {
+ cd "${BUILD_DIR}"
+ local libname=gslcblas
+
+ create_pkgconfig \
+ --name "${libname}" \
+ --description "${PN} CBLAS implementation" \
+ --libs "-l${libname}" \
+ --libs-private "-lm" \
+ --cflags "-I\${includedir}/${PN}" \
+ --version "${PV}" \
+ --url "${HOMEPAGE}" \
+ "${libname}"
+
+ GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
+
+ default
+ }
+ multilib_foreach_abi gsl_install
+
+ # Don't add gsl as a cblas alternative if using cblas-external
+ use cblas-external || alternatives_for cblas gsl 0 \
+ ${GSL_ALTERNATIVES[@]} \
+ /usr/include/cblas.h gsl/gsl_cblas.h
+}
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
deleted file mode 100644
index c02ed3d2f..000000000
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NUMERIC_MODULE_NAME="gsl"
-
-inherit autotools flag-o-matic numeric-int64-multibuild toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_prepare() {
- default
- eautoreconf
- numeric-int64-multibuild_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- if numeric-int64_is_int64_build; then
- append-fflags $(fortran_int64_abi_fflags)
- fi
- econf $(use_with cblas-external)
- }
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_configure
-}
-
-src_compile() {
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
-}
-
-src_test() {
- local MAKEOPTS="${MAKEOPTS} -j1"
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
-}
-
-src_install() {
- gsl_src_install() {
- local profname=$(numeric-int64_get_module_name)
- local libname="${profname//-/_}"
-
- default
-
- if ! numeric-int64_is_static_build; then
- create_pkgconfig \
- --name ${profname} \
- --description "${DESCRIPTION} CBLAS implementation" \
- --libs "-L\${libdir} -l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir} $(numeric-int64_get_fortran_int64_abi_fflags)" \
- ${profname}
- fi
-
- }
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_src_install
-
- printf "/usr/include/cblas.h ${PN}/cblas.h" > "${T}"/alternative-cblas-generic.sh || die
-
- use cblas-external || \
- numeric-int64-multibuild_install_alternative cblas ${NUMERIC_MODULE_NAME}
-}
diff --git a/sci-libs/gsl/gsl-2.3-r1.ebuild b/sci-libs/gsl/gsl-2.3-r1.ebuild
new file mode 100644
index 000000000..95b4344be
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
+
+DESCRIPTION="GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/19"
+KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-cblas-external.patch
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+ multilib_copy_sources
+}
+
+src_configure() {
+ gsl_configure() {
+ cd "${BUILD_DIR}"
+ if use cblas-external; then
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+ fi
+ econf $(use_with cblas-external)
+ }
+ multilib_foreach_abi gsl_configure
+}
+
+src_compile() {
+ gsl_compile() {
+ cd "${BUILD_DIR}"
+ default
+ }
+ multilib_foreach_abi gsl_compile
+}
+
+src_install() {
+ gsl_install() {
+ cd "${BUILD_DIR}"
+ local libname=gslcblas
+
+ create_pkgconfig \
+ --name "${libname}" \
+ --description "${PN} CBLAS implementation" \
+ --libs "-l${libname}" \
+ --libs-private "-lm" \
+ --cflags "-I\${includedir}/${PN}" \
+ --version "${PV}" \
+ --url "${HOMEPAGE}" \
+ "${libname}"
+
+ GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
+
+ default
+ }
+ multilib_foreach_abi gsl_install
+
+ # Don't add gsl as a cblas alternative if using cblas-external
+ use cblas-external || alternatives_for cblas gsl 0 \
+ ${GSL_ALTERNATIVES[@]} \
+ /usr/include/cblas.h gsl/gsl_cblas.h
+}
+
+src_test() {
+ gsl_test() {
+ cd "${BUILD_DIR}"
+ default
+ }
+ multilib_foreach_abi gsl_test
+}
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
deleted file mode 100644
index c70483d8a..000000000
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NUMERIC_MODULE_NAME="gsl"
-
-inherit autotools flag-o-matic numeric-int64-multibuild toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19.3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_prepare() {
- default
- eautoreconf
- numeric-int64-multibuild_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- if numeric-int64_is_int64_build; then
- append-fflags $(fortran_int64_abi_fflags)
- fi
- econf $(use_with cblas-external)
- }
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_configure
-}
-
-src_compile() {
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
-}
-
-src_test() {
- local MAKEOPTS="${MAKEOPTS} -j1"
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir default
-}
-
-src_install() {
- gsl_src_install() {
- local profname=$(numeric-int64_get_module_name)
- local libname="${profname//-/_}"
-
- default
-
- if ! numeric-int64_is_static_build; then
- create_pkgconfig \
- --name ${profname} \
- --description "${DESCRIPTION} CBLAS implementation" \
- --libs "-L\${libdir} -l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir} $(numeric-int64_get_fortran_int64_abi_fflags)" \
- ${profname}
- fi
-
- }
- numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir gsl_src_install
-
- printf "/usr/include/cblas.h ${PN}/cblas.h" > "${T}"/alternative-cblas-generic.sh || die
-
- use cblas-external || \
- numeric-int64-multibuild_install_alternative cblas ${NUMERIC_MODULE_NAME}
-}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index bac5f4993..6e2e8e11f 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -21,6 +21,5 @@
<use>
<flag name="cblas-external">Link gsl with external cblas provided by
(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
- <flag name="int64">Build the 64 bits integer library</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
@ 2020-09-22 12:14 Aisha Tammy
0 siblings, 0 replies; 7+ messages in thread
From: Aisha Tammy @ 2020-09-22 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 0ac46aea43d5ac971a71263868ffe2940cc58822
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 12:10:50 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 12:10:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ac46aea
sci-libs/gsl: drop package
present in ::gentoo
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/gsl/files/gsl-1.16-cblas-external.patch | 294 --------------------
sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 -----------------------
sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 101 -------
sci-libs/gsl/gsl-1.16-r2.ebuild | 64 -----
sci-libs/gsl/gsl-2.1.ebuild | 72 -----
sci-libs/gsl/gsl-2.3.ebuild | 74 -----
sci-libs/gsl/gsl-2.4.ebuild | 78 ------
sci-libs/gsl/gsl-2.5.ebuild | 78 ------
sci-libs/gsl/metadata.xml | 25 --
9 files changed, 1112 deletions(-)
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
deleted file mode 100644
index c29ef5294..000000000
--- a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
---- gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+ [External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+ [Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I<include_dir>"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
---- gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700
-@@ -12,6 +12,6 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES = test.c
-diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
---- gsl-1.16.orig/configure.ac 2013-07-19 08:14:45.000000000 -0700
-+++ gsl-1.16/configure.ac 2013-08-19 15:28:24.172640793 -0700
-@@ -191,6 +191,16 @@
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>])
-diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
---- gsl-1.16.orig/eigen/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/eigen/Makefile.am 2013-08-19 15:25:27.728497742 -0700
-@@ -11,7 +11,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
---- gsl-1.16.orig/gsl-config.in 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl-config.in 2013-08-19 15:25:27.728497742 -0700
-@@ -58,11 +58,11 @@
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
---- gsl-1.16.orig/gsl.pc.in 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl.pc.in 2013-08-19 15:25:27.728497742 -0700
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am
---- gsl-1.16.orig/interpolation/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/interpolation/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
---- gsl-1.16.orig/linalg/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/linalg/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- check_PROGRAMS = test
-
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
---- gsl-1.16.orig/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -19,13 +19,12 @@
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
- MINGW32_HOST = @MINGW32_HOST@
- if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS += -no-undefined
- endif
-
-@@ -35,10 +34,10 @@
- bin_PROGRAMS = gsl-randist gsl-histogram
-
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
-
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -57,6 +56,8 @@
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
---- gsl-1.16.orig/multifit/Makefile.am 2013-07-18 06:04:26.000000000 +1000
-+++ gsl-1.16/multifit/Makefile.am 2013-11-22 16:57:26.170330257 +1100
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
-diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
---- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
---- gsl-1.16.orig/multiroots/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/multiroots/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -15,5 +15,5 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am
---- gsl-1.16.orig/ode-initval/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/ode-initval/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
---- gsl-1.16.orig/poly/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/poly/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--check_PROGRAMS = test
-+#check_PROGRAMS = test
-
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
---- gsl-1.16.orig/specfunc/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/specfunc/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- check_PROGRAMS = test
-
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-
-diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
---- gsl-1.16.orig/wavelet/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/wavelet/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
diff --git a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
deleted file mode 100644
index 54cc8802c..000000000
--- a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
+++ /dev/null
@@ -1,326 +0,0 @@
- Makefile.am | 8 +++---
- ax_cblas.m4 | 69 +++++++++++++++++++++++++++++++++++++++++++++++
- bspline/Makefile.am | 2 +-
- configure.ac | 10 +++++++
- eigen/Makefile.am | 2 +-
- gsl-config.in | 4 +--
- gsl.pc.in | 2 +-
- interpolation/Makefile.am | 2 +-
- linalg/Makefile.am | 2 +-
- multifit/Makefile.am | 4 +--
- multimin/Makefile.am | 4 +--
- multiroots/Makefile.am | 2 +-
- ode-initval/Makefile.am | 2 +-
- poly/Makefile.am | 2 +-
- specfunc/Makefile.am | 2 +-
- wavelet/Makefile.am | 2 +-
- 16 files changed, 100 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 278dcd9..a75418c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
-@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
- bin_PROGRAMS = gsl-randist gsl-histogram
-
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
-
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
-diff --git a/ax_cblas.m4 b/ax_cblas.m4
-new file mode 100644
-index 0000000..6ef143a
---- /dev/null
-+++ b/ax_cblas.m4
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+ [External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+ [Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I<include_dir>"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff --git a/bspline/Makefile.am b/bspline/Makefile.am
-index 3f4f950..d413036 100644
---- a/bspline/Makefile.am
-+++ b/bspline/Makefile.am
-@@ -12,6 +12,6 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES = test.c
-diff --git a/configure.ac b/configure.ac
-index d6b673f..c642454 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -205,6 +205,16 @@ if test "x$LIBS" = "x" ; then
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>])
-diff --git a/eigen/Makefile.am b/eigen/Makefile.am
-index c28bfde..14197a4 100644
---- a/eigen/Makefile.am
-+++ b/eigen/Makefile.am
-@@ -11,7 +11,7 @@ noinst_HEADERS = qrstep.c
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-
- test_SOURCES = test.c
-
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
-index 1d80755..e45bd51 100644
---- a/interpolation/Makefile.am
-+++ b/interpolation/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/linalg/Makefile.am b/linalg/Makefile.am
-index 8fb6e7c..90d22e0 100644
---- a/linalg/Makefile.am
-+++ b/linalg/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
-
- check_PROGRAMS = test
-
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/multifit/Makefile.am b/multifit/Makefile.am
-index 891964b..b33f71e 100644
---- a/multifit/Makefile.am
-+++ b/multifit/Makefile.am
-@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-
-diff --git a/multimin/Makefile.am b/multimin/Makefile.am
-index 7071359..65a488a 100644
---- a/multimin/Makefile.am
-+++ b/multimin/Makefile.am
-@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
-index a351c3f..6178448 100644
---- a/multiroots/Makefile.am
-+++ b/multiroots/Makefile.am
-@@ -15,5 +15,5 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
-diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
-index 9c774b5..346c381 100644
---- a/ode-initval/Makefile.am
-+++ b/ode-initval/Makefile.am
-@@ -12,7 +12,7 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/poly/Makefile.am b/poly/Makefile.am
-index f1dae5d..e0f8e83 100644
---- a/poly/Makefile.am
-+++ b/poly/Makefile.am
-@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
-
- TESTS = $(check_PROGRAMS)
-
--check_PROGRAMS = test
-+#check_PROGRAMS = test
-
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
-index 0a7e672..d1361d0 100644
---- a/specfunc/Makefile.am
-+++ b/specfunc/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
-
- check_PROGRAMS = test
-
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-
-diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
-index 9da20d8..8cdbd77 100644
---- a/wavelet/Makefile.am
-+++ b/wavelet/Makefile.am
-@@ -10,7 +10,7 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
deleted file mode 100644
index 38b25aacc..000000000
--- a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c522001..4513bc8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
-@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
- bin_PROGRAMS = gsl-randist gsl-histogram
-
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
-
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
-diff --git a/configure.ac b/configure.ac
-index a26fc1e..564d426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -208,6 +208,16 @@ if test "x$LIBS" = "x" ; then
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>])
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index f0dcc02..b2f0c0e 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -8,5 +8,5 @@ examples_txt = blas.txt block.txt bspline.txt cblas.txt cdf.txt cheb.txt combina
-
- dist_noinst_DATA = $(examples_src) $(examples_txt)
-
--LDADD = ../../libgsl.la ../../cblas/libgslcblas.la
-+LDADD = ../../libgsl.la @CBLAS_LINK_LIBS@
- AM_DEFAULT_SOURCE_EXT = .c
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
deleted file mode 100644
index a28f92b5c..000000000
--- a/sci-libs/gsl/gsl-1.16-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit alternatives-2 autotools-multilib eutils toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- local myeconfargs=(
- $(use_with cblas-external)
- )
- autotools-multilib_src_configure
-}
-
-multilib_src_install() {
- autotools-utils_src_install
- local libname=gslcblas
-
- cat <<-EOF > ${libname}.pc
- prefix=${EPREFIX}/usr
- libdir=\${prefix}/$(get_libdir)
- includedir=\${prefix}/include
- Name: ${libname}
- Description: ${DESCRIPTION} CBLAS implementation
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -l${libname}
- Libs.private: -lm
- Cflags: -I\${includedir}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${libname}.pc
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
-}
-
-multilib_src_install_all() {
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
deleted file mode 100644
index 299a889fc..000000000
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf $(use_with cblas-external)
- }
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
deleted file mode 100644
index 296d8e964..000000000
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf $(use_with cblas-external)
- }
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
deleted file mode 100644
index f8cb47e0f..000000000
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf $(use_with cblas-external)
- }
- # fma flags, which can be enabled by -march=native, cause some tests to fail.
- # https://github.com/gentoo/sci/pull/815
- append-cflags $(test-flags-CC -mno-fma -mno-fma4)
-
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
deleted file mode 100644
index 3dda7b878..000000000
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf $(use_with cblas-external)
- }
- # fma flags, which can be enabled by -march=native, cause some tests to fail.
- # https://github.com/gentoo/sci/pull/815
- append-cflags $(test-flags-CC -mno-fma -mno-fma4)
-
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
deleted file mode 100644
index 06112a27a..000000000
--- a/sci-libs/gsl/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
-The GNU Scientific Library (GSL) is a collection of routines for
-numerical analysis. The routines are written from scratch by the GSL
-team in C, and present a modern API for C programmers, while allowing
-wrappers to be written for very high level languages.
-
-GSL includes data types and routines for complex numbers, vectors,
-matrices, basic linear algebra subroutines (BLAS), eigensystems,
-simulated annealing, minimization, root finding, pseudo-random
-numbers, least-squares fitting, fast Fourier transforms (FFT),
-differential equations, quadrature, Monte Carlo integration, special
-functions, physical constants, and much more.
-</longdescription>
- <use>
- <flag name="cblas-external">Link gsl with external cblas provided by
-(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-22 12:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-11 20:50 [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 12:14 Aisha Tammy
2017-03-08 7:30 Marius Brehler
2016-02-12 9:26 Justin Lecher
2013-08-19 23:33 Sebastien Fabbro
2012-02-23 19:05 Sebastien Fabbro
2011-08-22 19:26 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox