summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-02-28 14:20:47 +0000
committerJustin Lecher <jlec@gentoo.org>2012-02-28 14:20:47 +0000
commit2201bebd35b0249d49fc032739323418c71cdf3a (patch)
tree8e1760d845ab830b01b7662be5288eaf5ea6cada /sci-libs
parentFixing slot for #406149 (diff)
downloadhistorical-2201bebd35b0249d49fc032739323418c71cdf3a.tar.gz
historical-2201bebd35b0249d49fc032739323418c71cdf3a.tar.bz2
historical-2201bebd35b0249d49fc032739323418c71cdf3a.zip
Moved to autotools-utils, EAPI=4, fix blas/lapack detection and add USE=static-libs
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/superlu/ChangeLog9
-rw-r--r--sci-libs/superlu/Manifest15
-rw-r--r--sci-libs/superlu/files/superlu-4.3-autotools.patch584
-rw-r--r--sci-libs/superlu/metadata.xml4
-rw-r--r--sci-libs/superlu/superlu-4.3.ebuild24
5 files changed, 612 insertions, 24 deletions
diff --git a/sci-libs/superlu/ChangeLog b/sci-libs/superlu/ChangeLog
index e4ea47dfec63..d9adf058d435 100644
--- a/sci-libs/superlu/ChangeLog
+++ b/sci-libs/superlu/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/superlu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.13 2011/11/27 04:14:47 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.14 2012/02/28 14:20:47 jlec Exp $
+
+ 28 Feb 2012; Justin Lecher <jlec@gentoo.org> superlu-4.3.ebuild,
+ +files/superlu-4.3-autotools.patch, metadata.xml:
+ Moved to autotools-utils, EAPI=4, fix blas/lapack detection and add
+ USE=static-libs
*superlu-4.3 (27 Nov 2011)
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 90e007be77e2..50ccbffd0efb 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,10 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX 4.0-test.patch 1868 RMD160 861585be2d9cc3da505c0e8c0dd6e83e6e2708de SHA1 d9294695af21d725fdfbf2e48dc31c2aca6dd410 SHA256 263e24c1e502a28541b180b50ffaf98a49de7ee450386bf2660f6ab20e72c3d0
AUX superlu-4.0-autotools.patch 11176 RMD160 060db9407e6c8d69bb2c4b0305580b72048358bf SHA1 53b05fa2ea3da4e2c7d0812a9c29dbdddee2cebc SHA256 10632706a011be2568a2bb32f80ada53301dac1601dddc0d0275d3671aee72f0
AUX superlu-4.1-autotools.patch 19217 RMD160 94e7cceb3fae548810d3115096d95f686a4f8eb9 SHA1 fbdd4d415cff09e8d66723528178d7f6207f1e38 SHA256 cfdf7e039c7b0fcbf49b4f756678b2d3b120527345f7221347d0e02dc6705607
AUX superlu-4.2-autotools.patch 18746 RMD160 ef95e2ab2fa7196f01fe380c56e0e68e0c4decba SHA1 a03fd99af9f634927230c3c35c9824e93247aac6 SHA256 1414cc6fb7ce795d5d500c1289b1005f5a38a90e4349a722e1c118cac2dfc81e
+AUX superlu-4.3-autotools.patch 18676 RMD160 6a0bf71b6cbf2fe3d354a4dbe8ee21eb092f6e55 SHA1 c9cc1c9a7aceef81530c73eab7f599d652c1fddd SHA256 6dea0fca12629825ec729fafa488ff2025cd950e93b768d5636fa4d05c760291
AUX superlu-examples.patch 453 RMD160 471c1f75f6498c8165816722f2ec2d975110f343 SHA1 027f4376b1dc17131f6038b2eb9f9d245cbd14fe SHA256 56dcb30492c6b4b846a401ea302212b7b18f006c121f6d5a71dcdd59d9675a34
DIST superlu_4.0.tar.gz 2163874 RMD160 79a1b3ac9c5aa02a0f16ab170dff5802c1cfb410 SHA1 f6caa9a7324d68e9bce7f315bad6062a1326710f SHA256 2f160235ef702da77782a21f201f320c71e5be492fdd53b22564f5195e3309e6
DIST superlu_4.1.tar.gz 2235055 RMD160 721b8ee7d44bfce5e2acda3718cda9694ab344a7 SHA1 7f71512316f4e421076ce7e257c8b939c348e5c2 SHA256 db79b732c6defc1b8f9a48d202bd52bd2a506eb355333e2073c4949c0f48fcf1
@@ -13,13 +14,13 @@ DIST superlu_4.3.tar.gz 2876631 RMD160 8969d9a055207d91ce76e24237e893297c728af0
EBUILD superlu-4.0-r2.ebuild 1801 RMD160 b98c871f816058b2e2d9f50ad72cd0c118199554 SHA1 bf0427eacd41500e208fc2bcb315a47f8da373d8 SHA256 8500f2268cbf533d80fa7b2240d2487df3c722cc6cc9daddef4fb30615ff4444
EBUILD superlu-4.1-r1.ebuild 1552 RMD160 d0a9c1d61c946543998c16fdab93cce385466891 SHA1 3406c389993ef5437062881f4d815a877e6598cd SHA256 55eb5238d0962f0995d07feebab45a71b8ffaafa6c549732dc70a344bcc416e8
EBUILD superlu-4.2.ebuild 1409 RMD160 a419680797d9a45c7344c9b73ac64998df1ab1ea SHA1 3c4999783e63f369f4f130b159e7f1d663b7e31a SHA256 e496e4cb5e18d3ca4d750196620eece8276a4f9c6173c185954554609eb497ca
-EBUILD superlu-4.3.ebuild 1460 RMD160 59a611ae2de6c5a10480e0c43c3e267887850045 SHA1 93a0c76d7676ff03bc0b4c95afd1ff209cf282f5 SHA256 cd4058be5b0eb4100654d9d4ba8dbc89acf1509b9d979435e4a05835b7a2dff5
-MISC ChangeLog 2334 RMD160 99f3605468ce37f8bdd6a9e8d5d7e5363a3c11a4 SHA1 e21521f28a65bf8b9deb209f86fe0106f14ce15c SHA256 93864743856bee178f2b6162c87d77594632ff8deb52fe639015537c3a92db64
-MISC metadata.xml 1183 RMD160 90584eb7b02f392d8dcf1f7593d00532575fb2e7 SHA1 1f4720b37a9547af2f81d9eb9c72b0031ede1f6d SHA256 1086830fe855bba67b44bf4862464d8ecb88495e5242a7a06a97eb284dc5657c
+EBUILD superlu-4.3.ebuild 1483 RMD160 6170f80fb8e0c3c50ed4327d8927e5110188a882 SHA1 f871be0d14fc7195f448248caedc5f9f267130e3 SHA256 907d592c22563381c6e5a49c78164e7a04b931412effb74752561d75f1dd4c93
+MISC ChangeLog 2538 RMD160 9168d1fecda9624253a8df9bd2eddfdac47ef80f SHA1 d81471bb37bcbe98efacf813a229baab82181278 SHA256 f561dd1df3a860f0872455d002010f8b42db63c37fe7b31febcd511ec6c67110
+MISC metadata.xml 1185 RMD160 d2a53c173ff254e396232e8d29d29cae7943aee7 SHA1 7df008eab629b7808f0cad775fcb7b4180dbcf45 SHA256 7eb0da3866c061333569334a6caea2b442a8ba39c6833e2cded877f811abc03d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7RuUAACgkQ1ycZbhPLE2AL7wCfc6Okf8jRHECVCwoPrpNV76V4
-Jc4AnjY/qjfCT3S+k/x5ibMf2ud3kkuo
-=y+X+
+iEYEAREKAAYFAk9M4sQACgkQgAnW8HDreRbzXgCeNsPN14DhRekEWkTR5wz4Fsgc
+/hwAn2COw5orNUxmkSKOmFveb5CulHaF
+=ex7M
-----END PGP SIGNATURE-----
diff --git a/sci-libs/superlu/files/superlu-4.3-autotools.patch b/sci-libs/superlu/files/superlu-4.3-autotools.patch
new file mode 100644
index 000000000000..c5aae0159344
--- /dev/null
+++ b/sci-libs/superlu/files/superlu-4.3-autotools.patch
@@ -0,0 +1,584 @@
+ EXAMPLE/Makefile | 68 +++++++++---------
+ FORTRAN/Makefile | 14 ++--
+ Makefile.am | 4 +
+ SRC/Makefile.am | 110 +++++++++++++++++++++++++++++
+ ax_blas.m4 | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 16 ++++
+ superlu.pc.in | 13 ++++
+ 7 files changed, 385 insertions(+), 41 deletions(-)
+
+diff --git a/EXAMPLE/Makefile b/EXAMPLE/Makefile
+index c286ded..37950dc 100644
+--- a/EXAMPLE/Makefile
++++ b/EXAMPLE/Makefile
+@@ -1,4 +1,3 @@
+-include ../make.inc
+
+ #######################################################################
+ # This makefile creates the example programs for the linear equation
+@@ -32,7 +31,9 @@ include ../make.inc
+ #
+ #######################################################################
+
+-HEADER = ../SRC
++HEADER = $(shell pkg-config --cflags superlu)
++LIBS = $(shell pkg-config --libs superlu)
++CDEFS = -DAdd_
+
+ SLINEXM = slinsol.o
+ SLINEXM1 = slinsol1.o
+@@ -67,7 +68,6 @@ ZLINXEXM2 = zlinsolx2.o
+ ZITSOL = zitersol.o zfgmr.o
+ ZITSOL1 = zitersol1.o zfgmr.o
+
+-
+ all: single double complex complex16
+
+ single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 sitersol sitersol1
+@@ -77,97 +77,97 @@ complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 citersol citersol1
+ complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zitersol zitersol1
+
+ slinsol: $(SLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SLINEXM) $(LIBS) -o $@
+
+ slinsol1: $(SLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SLINEXM1) $(LIBS) -o $@
+
+ slinsolx: $(SLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SLINXEXM) $(LIBS) -o $@
+
+ slinsolx1: $(SLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SLINXEXM1) $(LIBS) -o $@
+
+ slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SLINXEXM2) $(LIBS) -o $@
+
+ sitersol: $(SITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SITSOL) $(LIBS) -o $@
+
+ sitersol1: $(SITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SITSOL1) $(LIBS) -o $@
+
+ dlinsol: $(DLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DLINEXM) $(LIBS) -o $@
+
+ dlinsol1: $(DLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DLINEXM1) $(LIBS) -o $@
+
+ dlinsolx: $(DLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DLINXEXM) $(LIBS) -o $@
+
+ dlinsolx1: $(DLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DLINXEXM1) $(LIBS) -o $@
+
+ dlinsolx2: $(DLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DLINXEXM2) $(LIBS) -o $@
+
+ superlu: $(SUPERLUEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(SUPERLUEXM) $(LIBS) -o $@
+
+ ditersol: $(DITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DITSOL) $(LIBS) -o $@
+
+ ditersol1: $(DITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(DITSOL1) $(LIBS) -o $@
+
+ clinsol: $(CLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CLINEXM) $(LIBS) -o $@
+
+ clinsol1: $(CLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CLINEXM1) $(LIBS) -o $@
+
+ clinsolx: $(CLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CLINXEXM) $(LIBS) -o $@
+
+ clinsolx1: $(CLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CLINXEXM1) $(LIBS) -o $@
+
+ clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CLINXEXM2) $(LIBS) -o $@
+
+ citersol: $(CITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CITSOL) $(LIBS) -o $@
+
+ citersol1: $(CITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(CITSOL1) $(LIBS) -o $@
+
+ zlinsol: $(ZLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZLINEXM) $(LIBS) -o $@
+
+ zlinsol1: $(ZLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZLINEXM1) $(LIBS) -o $@
+
+ zlinsolx: $(ZLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZLINXEXM) $(LIBS) -o $@
+
+ zlinsolx1: $(ZLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZLINXEXM1) $(LIBS) -o $@
+
+ zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZLINXEXM2) $(LIBS) -o $@
+
+ zitersol: $(ZITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAGS) $(ZITSOL) $(LIBS) -o $@
+
+ zitersol1: $(ZITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@
++ $(LD) $(LDFLAG) $(ZITSOL1) $(LIBS) -o $@
+
+ .c.o:
+- $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
++ $(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
+
+ .f.o:
+- $(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
++ $(FC) $(FFLAGS) -c $< $(VERBOSE)
+
+ clean:
+ rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
+diff --git a/FORTRAN/Makefile b/FORTRAN/Makefile
+index 23671a7..54da751 100644
+--- a/FORTRAN/Makefile
++++ b/FORTRAN/Makefile
+@@ -1,12 +1,12 @@
+-include ../make.inc
++#include ../make.inc
+
+ #######################################################################
+ # This makefile creates the Fortran example interface to use the
+ # C routines in SuperLU.
+ #######################################################################
+
+-HEADER = ../SRC
+-LIBS = $(SUPERLULIB) $(BLASLIB) -lm
++HEADER = $(shell pkg-config --cflags superlu)
++LIBS = $(shell pkg-config --libs superlu)
+
+ # double real
+ F77EXM = f77_main.o hbcode1.o c_fortran_dgssv.o
+@@ -17,19 +17,19 @@ ZF77EXM = z_f77_main.o zhbcode1.o c_fortran_zgssv.o
+ all: f77exm zf77exm
+
+ f77exm: $(F77EXM) $(SUPERLULIB)
+- $(FORTRAN) $(LOADOPTS) $(F77EXM) $(LIBS) -o $@
++ $(FC) $(LDFLAGS) $(F77EXM) $(LIBS) -o $@
+
+ zf77exm: $(ZF77EXM) $(SUPERLULIB)
+ $(FORTRAN) $(LOADOPTS) $(ZF77EXM) $(LIBS) -o $@
+
+ c_fortran_zgssv.o: c_fortran_zgssv.c
+- $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
++ $(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
+
+ .c.o:
+- $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
++ $(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
+
+ .f.o:
+- $(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
++ $(FC) $(FFLAGS) -c $< $(VERBOSE)
+
+ clean:
+ rm -f *.o f77exm zf77exm
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..7e51046
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,4 @@
++SUBDIRS = SRC
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = superlu.pc
+diff --git a/SRC/Makefile.am b/SRC/Makefile.am
+new file mode 100644
+index 0000000..748e5e9
+--- /dev/null
++++ b/SRC/Makefile.am
+@@ -0,0 +1,110 @@
++AM_CPPFLAGS = -DAdd_
++
++### headers
++noinst_HEADERS = \
++ colamd.h \
++ html_mainpage.h
++
++src_includedir = $(includedir)/superlu
++src_include_HEADERS = \
++ slu_cdefs.h \
++ slu_ddefs.h \
++ slu_sdefs.h \
++ slu_zdefs.h \
++ slu_Cnames.h \
++ slu_dcomplex.h \
++ slu_scomplex.h \
++ slu_util.h \
++ superlu_enum_consts.h \
++ supermatrix.h
++
++### LAPACK
++LAAUX = lsame.c xerbla.c
++SLASRC = slacon.c
++DLASRC = dlacon.c
++CLASRC = clacon.c scsum1.c icmax1.c
++ZLASRC = zlacon.c dzsum1.c izmax1.c
++
++
++##################################
++# Do not optimize these routines #
++##################################
++CFLAGS_SAV=@CFLAGS@
++CFLAGS=
++noinst_LTLIBRARIES = libnoopt.la
++libnoopt_la_SOURCES = slamch.c dlamch.c superlu_timer.c
++libnoopt_la_CFLAGS = -O0
++
++### SuperLU
++ALLAUX = util.c memory.c get_perm_c.c mmd.c \
++ sp_coletree.c sp_preorder.c sp_ienv.c relax_snode.c \
++ heap_relax_snode.c colamd.c \
++ ilu_relax_snode.c ilu_heap_relax_snode.c mark_relax.c \
++ mc64ad.f qselect.f
++
++SLUSRC = \
++ sgssv.c sgssvx.c \
++ ssp_blas2.c ssp_blas3.c sgscon.c \
++ slangs.c sgsequ.c slaqgs.c spivotgrowth.c \
++ sgsrfs.c sgstrf.c sgstrs.c scopy_to_ucol.c \
++ ssnode_dfs.c ssnode_bmod.c \
++ spanel_dfs.c spanel_bmod.c sreadhb.c \
++ scolumn_dfs.c scolumn_bmod.c spivotL.c spruneL.c \
++ smemory.c sutil.c smyblas2.c \
++ sgsisx.c sgsitrf.c sldperm.c \
++ ilu_sdrop_row.c ilu_ssnode_dfs.c \
++ ilu_scolumn_dfs.c ilu_spanel_dfs.c ilu_scopy_to_ucol.c \
++ ilu_spivotL.c sdiagonal.c
++
++DLUSRC = \
++ dgssv.c dgssvx.c \
++ dsp_blas2.c dsp_blas3.c dgscon.c \
++ dlangs.c dgsequ.c dlaqgs.c dpivotgrowth.c \
++ dgsrfs.c dgstrf.c dgstrs.c dcopy_to_ucol.c \
++ dsnode_dfs.c dsnode_bmod.c \
++ dpanel_dfs.c dpanel_bmod.c dreadhb.c \
++ dcolumn_dfs.c dcolumn_bmod.c dpivotL.c dpruneL.c \
++ dmemory.c dutil.c dmyblas2.c \
++ dgsisx.c dgsitrf.c \
++ dldperm.c \
++ ilu_ddrop_row.c ilu_dsnode_dfs.c \
++ ilu_dcolumn_dfs.c ilu_dpanel_dfs.c ilu_dcopy_to_ucol.c \
++ ilu_dpivotL.c ddiagonal.c
++
++CLUSRC = \
++ scomplex.c cgssv.c cgssvx.c csp_blas2.c csp_blas3.c cgscon.c \
++ clangs.c cgsequ.c claqgs.c cpivotgrowth.c \
++ cgsrfs.c cgstrf.c cgstrs.c ccopy_to_ucol.c \
++ csnode_dfs.c csnode_bmod.c \
++ cpanel_dfs.c cpanel_bmod.c creadhb.c \
++ ccolumn_dfs.c ccolumn_bmod.c cpivotL.c cpruneL.c \
++ cmemory.c cutil.c cmyblas2.c \
++ cgsisx.c cgsitrf.c cldperm.c \
++ ilu_cdrop_row.c ilu_csnode_dfs.c \
++ ilu_ccolumn_dfs.c ilu_cpanel_dfs.c ilu_ccopy_to_ucol.c \
++ ilu_cpivotL.c cdiagonal.c
++
++ZLUSRC = \
++ dcomplex.c zgssv.c zgssvx.c zsp_blas2.c zsp_blas3.c zgscon.c \
++ zlangs.c zgsequ.c zlaqgs.c zpivotgrowth.c \
++ zgsrfs.c zgstrf.c zgstrs.c zcopy_to_ucol.c \
++ zsnode_dfs.c zsnode_bmod.c \
++ zpanel_dfs.c zpanel_bmod.c zreadhb.c \
++ zcolumn_dfs.c zcolumn_bmod.c zpivotL.c zpruneL.c \
++ zmemory.c zutil.c zmyblas2.c \
++ zgsisx.c zgsitrf.c zldperm.c \
++ ilu_zdrop_row.c ilu_zsnode_dfs.c \
++ ilu_zcolumn_dfs.c ilu_zpanel_dfs.c ilu_zcopy_to_ucol.c \
++ ilu_zpivotL.c zdiagonal.c
++
++lib_LTLIBRARIES = libsuperlu.la
++libsuperlu_la_SOURCES = \
++ $(NOOPTAUX) \
++ $(ALLAUX) $(LAAUX) \
++ $(SLUSRC) $(SLASRC) \
++ $(DLUSRC) $(DLASRC) \
++ $(CLUSRC) $(CLASRC) \
++ $(ZLUSRC) $(ZLASRC)
++libsuperlu_la_CFLAGS = $(CFLAGS_SAV)
++libsuperlu_la_LIBADD = $(BLAS_LIBS) libnoopt.la
++libsuperlu_la_LDFLAGS = -no-undefined -version-info 4:2:0
+diff --git a/ax_blas.m4 b/ax_blas.m4
+new file mode 100644
+index 0000000..e4f96cb
+--- /dev/null
++++ b/ax_blas.m4
+@@ -0,0 +1,201 @@
++# ===========================================================================
++# http://www.gnu.org/software/autoconf-archive/ax_blas.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++# This macro looks for a library that implements the BLAS linear-algebra
++# interface (see http://www.netlib.org/blas/). On success, it sets the
++# BLAS_LIBS output variable to hold the requisite library linkages.
++#
++# To link with BLAS, you should link with:
++#
++# $BLAS_LIBS $LIBS $FLIBS
++#
++# in that order. FLIBS is the output variable of the
++# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
++# sometimes necessary in order to link with F77 libraries. Users will also
++# need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
++# reason.
++#
++# Many libraries are searched for, from ATLAS to CXML to ESSL. The user
++# may also use --with-blas=<lib> in order to use some specific BLAS
++# library <lib>. In order to link successfully, however, be aware that you
++# will probably need to use the same Fortran compiler (which can be set
++# via the F77 env. var.) as was used to compile the BLAS library.
++#
++# ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is
++# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
++# not found. If ACTION-IF-FOUND is not specified, the default action will
++# define HAVE_BLAS.
++#
++# LICENSE
++#
++# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation, either version 3 of the License, or (at your
++# option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++# Public License for more details.
++#
++# You should have received a copy of the GNU General Public License along
++# with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++# As a special exception, the respective Autoconf Macro's copyright owner
++# gives unlimited permission to copy, distribute and modify the configure
++# scripts that are the output of Autoconf when processing the Macro. You
++# need not follow the terms of the GNU General Public License when using
++# or distributing such scripts, even though portions of the text of the
++# Macro appear in them. The GNU General Public License (GPL) does govern
++# all other use of the material that constitutes the Autoconf Macro.
++#
++# This special exception to the GPL applies to versions of the Autoconf
++# Macro released by the Autoconf Archive. When you make and distribute a
++# modified version of the Autoconf Macro, you may extend this special
++# exception to the GPL to apply to your modified version as well.
++
++#serial 11
++
++AU_ALIAS([ACX_BLAS], [AX_BLAS])
++AC_DEFUN([AX_BLAS], [
++AC_PREREQ(2.50)
++AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
++ax_blas_ok=no
++
++AC_ARG_WITH(blas,
++ [AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
++case $with_blas in
++ yes | "") ;;
++ no) ax_blas_ok=disable ;;
++ -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++ *) BLAS_LIBS="-l$with_blas" ;;
++esac
++
++# Get fortran linker names of BLAS functions to check for.
++AC_F77_FUNC(sgemm)
++AC_F77_FUNC(dgemm)
++
++ax_blas_save_LIBS="$LIBS"
++LIBS="$LIBS $FLIBS"
++
++# First, check BLAS_LIBS environment variable
++if test $ax_blas_ok = no; then
++if test "x$BLAS_LIBS" != x; then
++ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
++ AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""])
++ AC_MSG_RESULT($ax_blas_ok)
++ LIBS="$save_LIBS"
++fi
++fi
++
++# BLAS linked to by default? (happens on some supercomputers)
++if test $ax_blas_ok = no; then
++ save_LIBS="$LIBS"; LIBS="$LIBS"
++ AC_MSG_CHECKING([if $sgemm is being linked in already])
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes])
++ AC_MSG_RESULT($ax_blas_ok)
++ LIBS="$save_LIBS"
++fi
++
++# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(atlas, ATL_xerbla,
++ [AC_CHECK_LIB(f77blas, $sgemm,
++ [AC_CHECK_LIB(cblas, cblas_dgemm,
++ [ax_blas_ok=yes
++ BLAS_LIBS="-lcblas -lf77blas -latlas"],
++ [], [-lf77blas -latlas])],
++ [], [-latlas])])
++fi
++
++# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(blas, $sgemm,
++ [AC_CHECK_LIB(dgemm, $dgemm,
++ [AC_CHECK_LIB(sgemm, $sgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
++ [], [-lblas])],
++ [], [-lblas])])
++fi
++
++# BLAS in Intel MKL library?
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl"])
++fi
++
++# BLAS in Apple vecLib library?
++if test $ax_blas_ok = no; then
++ save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
++ AC_MSG_CHECKING([for $sgemm in -framework vecLib])
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"])
++ AC_MSG_RESULT($ax_blas_ok)
++ LIBS="$save_LIBS"
++fi
++
++# BLAS in Alpha CXML library?
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"])
++fi
++
++# BLAS in Alpha DXML library? (now called CXML, see above)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"])
++fi
++
++# BLAS in Sun Performance library?
++if test $ax_blas_ok = no; then
++ if test "x$GCC" != xyes; then # only works with Sun CC
++ AC_CHECK_LIB(sunmath, acosp,
++ [AC_CHECK_LIB(sunperf, $sgemm,
++ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
++ ax_blas_ok=yes],[],[-lsunmath])])
++ fi
++fi
++
++# BLAS in SCSL library? (SGI/Cray Scientific Library)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"])
++fi
++
++# BLAS in SGIMATH library?
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(complib.sgimath, $sgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
++fi
++
++# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(blas, $sgemm,
++ [AC_CHECK_LIB(essl, $sgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
++ [], [-lblas $FLIBS])])
++fi
++
++# Generic BLAS library?
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"])
++fi
++
++AC_SUBST(BLAS_LIBS)
++
++LIBS="$ax_blas_save_LIBS"
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_blas_ok" = xyes; then
++ ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
++ :
++else
++ ax_blas_ok=no
++ $2
++fi
++])dnl AX_BLAS
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..f6707be
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,16 @@
++# -*- Autoconf -*-
++AC_PREREQ(2.59)
++AC_INIT(superlu, 4.3, xsli@lbl.gov)
++AM_INIT_AUTOMAKE([foreign])
++AC_CONFIG_HEADER([config.h])
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++AC_PROG_F77
++sinclude(ax_blas.m4)
++AX_BLAS
++if test x"$BLAS_LIBS" = x; then
++ AC_MSG_ERROR([Cannot find blas libraries])
++fi
++AC_CHECK_LIB([m], [floor])
++AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc])
++AC_OUTPUT
+diff --git a/superlu.pc.in b/superlu.pc.in
+new file mode 100644
+index 0000000..7bf9942
+--- /dev/null
++++ b/superlu.pc.in
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: Sparse LU factorization library
++Version: @PACKAGE_VERSION@
++URL: http://crd.lbl.gov/~xiaoye/SuperLU/
++Libs: -L${libdir} -lsuperlu
++Libs.private: -lm @FLIBS@
++Requires: blas
++Cflags: -I${includedir}/superlu
diff --git a/sci-libs/superlu/metadata.xml b/sci-libs/superlu/metadata.xml
index 101acb6868f3..9292b169510f 100644
--- a/sci-libs/superlu/metadata.xml
+++ b/sci-libs/superlu/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">
SuperLU is a general purpose library for the direct solution of large,
sparse, nonsymmetric systems of linear equations on high performance
machines. The library is written in C and is callable from either C or
diff --git a/sci-libs/superlu/superlu-4.3.ebuild b/sci-libs/superlu/superlu-4.3.ebuild
index c082f2a58f69..73840c0985f9 100644
--- a/sci-libs/superlu/superlu-4.3.ebuild
+++ b/sci-libs/superlu/superlu-4.3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.1 2011/11/27 04:14:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.2 2012/02/28 14:20:47 jlec Exp $
EAPI=4
-inherit autotools eutils fortran-2 toolchain-funcs multilib
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fortran-2 toolchain-funcs multilib
MY_PN=SuperLU
@@ -25,20 +27,16 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_PN}_${PV}"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.2-autotools.patch
- sed -i -e "s/4.2/${PV}/" configure.ac || die
- eautoreconf
-}
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
src_configure() {
- econf \
- --with-blas="$(pkg-config --libs blas)" \
- $(use_enable static-libs static)
+ local myeconfargs=( --with-blas="$(pkg-config --libs blas)" )
+ autotools-utils_src_configure
}
src_test() {
- cd TESTING
+ cd "${AUTOTOOLS_BUILD_DIR}"/TESTING
emake -j1 \
CC="$(tc-getCC)" \
FORTRAN="$(tc-getFC)" \
@@ -53,7 +51,7 @@ src_test() {
}
src_install() {
- default
+ autotools-utils_src_install
use doc && dodoc DOC/ug.pdf && dohtml DOC/html/*
if use examples; then
insinto /usr/share/doc/${PF}/examples