diff options
| -rw-r--r-- | sci-libs/superlu/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-libs/superlu/files/superlu-4.0-autotools.patch | 389 | ||||
| -rw-r--r-- | sci-libs/superlu/superlu-4.0-r2.ebuild (renamed from sci-libs/superlu/superlu-4.0-r1.ebuild) | 8 |
3 files changed, 222 insertions, 185 deletions
diff --git a/sci-libs/superlu/ChangeLog b/sci-libs/superlu/ChangeLog index de289c455bb0..de26266e514b 100644 --- a/sci-libs/superlu/ChangeLog +++ b/sci-libs/superlu/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/superlu # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.1 2010/06/09 08:18:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.2 2010/09/27 06:26:22 bicatali Exp $ + +*superlu-4.0-r2 (27 Sep 2010) + + 27 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org> + -superlu-4.0-r1.ebuild, +superlu-4.0-r2.ebuild, + files/superlu-4.0-autotools.patch: + Fixed autotools patch: added missing files to the library, updated ax_blas + macro, pushed version to 4 instead of 3. Fixed tests *superlu-4.0-r1 (09 Jun 2010) diff --git a/sci-libs/superlu/files/superlu-4.0-autotools.patch b/sci-libs/superlu/files/superlu-4.0-autotools.patch index 5e14f263d3b5..d54e3ded1db3 100644 --- a/sci-libs/superlu/files/superlu-4.0-autotools.patch +++ b/sci-libs/superlu/files/superlu-4.0-autotools.patch @@ -1,107 +1,207 @@ ---- configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ configure.ac 2008-02-01 10:58:41.238020847 +0000 -@@ -0,0 +1,14 @@ +--- Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 ++++ Makefile.am 2010-09-27 06:03:01.000000000 +0100 +@@ -0,0 +1 @@ ++SUBDIRS = SRC +--- SRC/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 ++++ SRC/Makefile.am 2010-09-27 06:19:38.000000000 +0100 +@@ -0,0 +1,97 @@ ++AM_CPPFLAGS = -DAdd_ ++### 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 ++SCLAUX = slamch.c ++DZLAUX = dlamch.c ++ ++### SuperLU ++ALLAUX = superlu_timer.c 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 mc21.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 = \ ++ $(ALLAUX) $(LAAUX) \ ++ $(SCLAUX) $(DZLAUX) \ ++ $(SLUSRC) $(SLASRC) \ ++ $(DLUSRC) $(DLASRC) \ ++ $(CLUSRC) $(CLASRC) \ ++ $(ZLUSRC) $(ZLASRC) ++libsuperlu_la_LIBADD = $(BLAS_LIBS) ++libsuperlu_la_LDFLAGS = -no-undefined -version-info 4:0:0 ++ ++################################## ++# Do not optimize these routines # ++################################## ++LTCOMPILE_NOOPT = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) ++ ++slamch.lo: slamch.c ++ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++dlamch.lo: dlamch.c ++ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++superlu_timer.lo: superlu_timer.c ++ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++################################## +--- configure.ac.orig 1970-01-01 01:00:00.000000000 +0100 ++++ configure.ac 2010-09-27 06:11:06.000000000 +0100 +@@ -0,0 +1,16 @@ +# -*- Autoconf -*- +AC_PREREQ(2.59) -+AC_INIT(superlu, 3.0, xsli@lbl.gov) ++AC_INIT(superlu, 4.0, xsli@lbl.gov) +AM_INIT_AUTOMAKE([foreign]) +AC_CONFIG_HEADER([config.h]) +AC_PROG_INSTALL +AC_PROG_LIBTOOL -+sinclude(acx_blas.m4) -+ACX_BLAS ++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]) +AC_OUTPUT ---- acx_blas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ acx_blas.m4 2008-02-01 10:58:19.428778009 +0000 -@@ -0,0 +1,191 @@ -+##### http://autoconf-archive.cryp.to/acx_blas.html +--- ax_blas.m4.orig 1970-01-01 01:00:00.000000000 +0100 ++++ ax_blas.m4 2010-09-27 06:06:18.000000000 +0100 +@@ -0,0 +1,201 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_blas.html ++# =========================================================================== +# +# SYNOPSIS +# -+# ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) ++# 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. ++# 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 ++# $BLAS_LIBS $LIBS $FLIBS +# +# in that order. FLIBS is the output variable of the -+# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_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. ++# 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. +# -+# 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. ++# 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. +# -+# This macro requires autoconf 2.50 or later. ++# 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. +# -+# LAST MODIFICATION ++# LICENSE +# -+# 2007-07-29 ++# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> +# -+# COPYLEFT -+# -+# Copyright (c) 2007 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 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. ++# 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/>. ++# 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. ++# 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 Macro 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. ++# 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 + -+AC_DEFUN([ACX_BLAS], [ ++AU_ALIAS([ACX_BLAS], [AX_BLAS]) ++AC_DEFUN([AX_BLAS], [ +AC_PREREQ(2.50) +AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) -+acx_blas_ok=no ++ax_blas_ok=no + +AC_ARG_WITH(blas, -+ [AC_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])]) ++ [AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])]) +case $with_blas in + yes | "") ;; -+ no) acx_blas_ok=disable ;; ++ no) ax_blas_ok=disable ;; + -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;; + *) BLAS_LIBS="-l$with_blas" ;; +esac @@ -110,189 +210,118 @@ +AC_F77_FUNC(sgemm) +AC_F77_FUNC(dgemm) + -+acx_blas_save_LIBS="$LIBS" ++ax_blas_save_LIBS="$LIBS" +LIBS="$LIBS $FLIBS" + +# First, check BLAS_LIBS environment variable -+if test $acx_blas_ok = no; then ++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, [acx_blas_ok=yes], [BLAS_LIBS=""]) -+ AC_MSG_RESULT($acx_blas_ok) ++ 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 $acx_blas_ok = no; then ++if test $ax_blas_ok = no; then + save_LIBS="$LIBS"; LIBS="$LIBS" -+ AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes]) ++ 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 $acx_blas_ok = no; then ++if test $ax_blas_ok = no; then + AC_CHECK_LIB(atlas, ATL_xerbla, + [AC_CHECK_LIB(f77blas, $sgemm, + [AC_CHECK_LIB(cblas, cblas_dgemm, -+ [acx_blas_ok=yes ++ [ax_blas_ok=yes + BLAS_LIBS="-lcblas -lf77blas -latlas"], + [], [-lf77blas -latlas])], + [], [-latlas])]) +fi + +# BLAS in PhiPACK libraries? (requires generic BLAS lib, too) -+if test $acx_blas_ok = no; then ++if test $ax_blas_ok = no; then + AC_CHECK_LIB(blas, $sgemm, + [AC_CHECK_LIB(dgemm, $dgemm, + [AC_CHECK_LIB(sgemm, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"], ++ [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 $acx_blas_ok = no; then -+ AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"]) ++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 $acx_blas_ok = no; then -+ AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"]) ++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 $acx_blas_ok = no; then ++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" -+ acx_blas_ok=yes],[],[-lsunmath])]) ++ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath" ++ ax_blas_ok=yes],[],[-lsunmath])]) + fi +fi + +# BLAS in SCSL library? (SGI/Cray Scientific Library) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"]) ++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 $acx_blas_ok = no; then ++if test $ax_blas_ok = no; then + AC_CHECK_LIB(complib.sgimath, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"]) ++ [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"]) +fi + +# BLAS in IBM ESSL library? (requires generic BLAS lib, too) -+if test $acx_blas_ok = no; then ++if test $ax_blas_ok = no; then + AC_CHECK_LIB(blas, $sgemm, + [AC_CHECK_LIB(essl, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"], ++ [ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"], + [], [-lblas $FLIBS])]) +fi + +# Generic BLAS library? -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"]) ++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="$acx_blas_save_LIBS" ++LIBS="$ax_blas_save_LIBS" + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -+if test x"$acx_blas_ok" = xyes; then ++if test x"$ax_blas_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1]) + : +else -+ acx_blas_ok=no ++ ax_blas_ok=no + $2 +fi -+])dnl ACX_BLAS ---- Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Makefile.am 2008-02-01 10:58:19.428778009 +0000 -@@ -0,0 +1 @@ -+SUBDIRS = SRC ---- SRC/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ SRC/Makefile.am 2008-02-01 10:58:19.428778009 +0000 -@@ -0,0 +1,80 @@ -+AM_CPPFLAGS = -DAdd_ -+### 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 -+SCLAUX = slamch.c -+DZLAUX = dlamch.c -+ -+### SuperLU -+ALLAUX = superlu_timer.c 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 -+ -+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 -+ -+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 -+ -+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 -+ -+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 -+ -+lib_LTLIBRARIES = libsuperlu.la -+libsuperlu_la_SOURCES = \ -+ $(ALLAUX) $(LAAUX) \ -+ $(SCLAUX) $(DZLAUX) \ -+ $(SLUSRC) $(SLASRC) \ -+ $(DLUSRC) $(DLASRC) \ -+ $(CLUSRC) $(CLASRC) \ -+ $(ZLUSRC) $(ZLASRC) -+libsuperlu_la_LIBADD = $(BLAS_LIBS) -+libsuperlu_la_LDFLAGS = -no-undefined -version-info 3:0:0 -+ -+ -+ -+################################## -+# Do not optimize these routines # -+################################## -+LTCOMPILE_NOOPT = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -+ -+slamch.lo: slamch.c -+ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+dlamch.lo: dlamch.c -+ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+superlu_timer.lo: superlu_timer.c -+ $(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+################################## ++])dnl AX_BLAS diff --git a/sci-libs/superlu/superlu-4.0-r1.ebuild b/sci-libs/superlu/superlu-4.0-r2.ebuild index 2e9f7255e654..f53849eff925 100644 --- a/sci-libs/superlu/superlu-4.0-r1.ebuild +++ b/sci-libs/superlu/superlu-4.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.0-r1.ebuild,v 1.1 2010/06/09 08:18:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.0-r2.ebuild,v 1.1 2010/09/27 06:26:22 bicatali Exp $ EAPI="2" @@ -39,18 +39,17 @@ src_configure() { src_test() { cd TESTING/MATGEN - emake -j1 \ + emake \ FORTRAN="$(tc-getFC)" \ LOADER="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ FFLAGS="${FFLAGS}" \ LOADOPTS="${LDFLAGS}" \ - SUPERLULIB="../SRC/.libs/libsuperlu.a" \ BLASLIB="$(pkg-config --libs blas)" \ CC="$(tc-getCC)" \ || die "emake matrix generation failed" cd .. - emake -j1 \ + emake \ CC="$(tc-getCC)" \ FORTRAN="$(tc-getFC)" \ LOADER="$(tc-getCC)" \ @@ -59,6 +58,7 @@ src_test() { LOADOPTS="${LDFLAGS}" \ SUPERLULIB="../SRC/.libs/libsuperlu.so" \ BLASLIB="$(pkg-config --libs blas)" \ + LD_LIBRARY_PATH="../SRC/.libs" \ || die "emake test failed" } |