diff options
| -rw-r--r-- | sci-libs/superlu/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/superlu/files/superlu-4.1-autotools.patch | 38 | ||||
| -rw-r--r-- | sci-libs/superlu/superlu-4.1-r1.ebuild | 4 |
3 files changed, 29 insertions, 21 deletions
diff --git a/sci-libs/superlu/ChangeLog b/sci-libs/superlu/ChangeLog index 4a3ad38fa192..3d6d1707684f 100644 --- a/sci-libs/superlu/ChangeLog +++ b/sci-libs/superlu/ChangeLog @@ -1,6 +1,10 @@ # 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.4 2010/12/28 20:30:18 bicatali Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.5 2011/03/21 23:49:54 bicatali Exp $ + + 21 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> + files/superlu-4.1-autotools.patch: + New upstream tar ball, adjusting the autotools patch *superlu-4.1-r1 (28 Dec 2010) diff --git a/sci-libs/superlu/files/superlu-4.1-autotools.patch b/sci-libs/superlu/files/superlu-4.1-autotools.patch index e2510234ffe8..f96e9375fe14 100644 --- a/sci-libs/superlu/files/superlu-4.1-autotools.patch +++ b/sci-libs/superlu/files/superlu-4.1-autotools.patch @@ -1,6 +1,6 @@ diff -Nur SuperLU_4.1.orig/ax_blas.m4 SuperLU_4.1/ax_blas.m4 --- SuperLU_4.1.orig/ax_blas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ SuperLU_4.1/ax_blas.m4 2010-12-12 17:41:08.000000000 +0000 ++++ SuperLU_4.1/ax_blas.m4 2011-03-21 23:42:42.000000000 +0000 @@ -0,0 +1,201 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_blas.html @@ -205,7 +205,7 @@ diff -Nur SuperLU_4.1.orig/ax_blas.m4 SuperLU_4.1/ax_blas.m4 +])dnl AX_BLAS diff -Nur SuperLU_4.1.orig/configure.ac SuperLU_4.1/configure.ac --- SuperLU_4.1.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ SuperLU_4.1/configure.ac 2010-12-12 17:41:31.000000000 +0000 ++++ SuperLU_4.1/configure.ac 2011-03-21 23:42:42.000000000 +0000 @@ -0,0 +1,16 @@ +# -*- Autoconf -*- +AC_PREREQ(2.59) @@ -224,8 +224,8 @@ diff -Nur SuperLU_4.1.orig/configure.ac SuperLU_4.1/configure.ac +AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc]) +AC_OUTPUT diff -Nur SuperLU_4.1.orig/EXAMPLE/Makefile SuperLU_4.1/EXAMPLE/Makefile ---- SuperLU_4.1.orig/EXAMPLE/Makefile 2010-08-11 23:40:19.000000000 +0100 -+++ SuperLU_4.1/EXAMPLE/Makefile 2010-12-12 17:50:34.000000000 +0000 +--- SuperLU_4.1.orig/EXAMPLE/Makefile 2011-03-21 23:42:28.000000000 +0000 ++++ SuperLU_4.1/EXAMPLE/Makefile 2011-03-21 23:42:42.000000000 +0000 @@ -1,4 +1,3 @@ -include ../make.inc @@ -390,10 +390,11 @@ diff -Nur SuperLU_4.1.orig/EXAMPLE/Makefile SuperLU_4.1/EXAMPLE/Makefile clean: rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \ diff -Nur SuperLU_4.1.orig/FORTRAN/Makefile SuperLU_4.1/FORTRAN/Makefile ---- SuperLU_4.1.orig/FORTRAN/Makefile 2010-08-11 23:40:19.000000000 +0100 -+++ SuperLU_4.1/FORTRAN/Makefile 2010-12-12 17:50:23.000000000 +0000 -@@ -1,28 +1,27 @@ +--- SuperLU_4.1.orig/FORTRAN/Makefile 2011-03-21 23:42:29.000000000 +0000 ++++ SuperLU_4.1/FORTRAN/Makefile 2011-03-21 23:45:29.000000000 +0000 +@@ -1,12 +1,12 @@ -include ../make.inc ++#include ../make.inc ####################################################################### # This makefile creates the Fortran example interface to use the @@ -402,35 +403,38 @@ diff -Nur SuperLU_4.1.orig/FORTRAN/Makefile SuperLU_4.1/FORTRAN/Makefile -HEADER = ../SRC -LIBS = $(SUPERLULIB) $(BLASLIB) -lm -+HEADER = $(shell pkg-config --cflags superlu) ++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 @@ + all: f77exm zf77exm - all: f77exm - --f77exm: $(F77EXM) $(SUPERLULIB) + f77exm: $(F77EXM) $(SUPERLULIB) - $(FORTRAN) $(LOADOPTS) $(F77EXM) $(LIBS) -o $@ -+f77exm: $(F77EXM) + $(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) -c $< $(VERBOSE) ++ $(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE) .f.o: - $(FORTRAN) $(FFLAGS) -c $< $(VERBOSE) + $(FC) $(FFLAGS) -c $< $(VERBOSE) clean: - rm -f *.o f77exm + rm -f *.o f77exm zf77exm diff -Nur SuperLU_4.1.orig/Makefile.am SuperLU_4.1/Makefile.am --- SuperLU_4.1.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ SuperLU_4.1/Makefile.am 2010-12-12 17:47:31.000000000 +0000 ++++ SuperLU_4.1/Makefile.am 2011-03-21 23:42:42.000000000 +0000 @@ -0,0 +1,4 @@ +SUBDIRS = SRC + @@ -438,7 +442,7 @@ diff -Nur SuperLU_4.1.orig/Makefile.am SuperLU_4.1/Makefile.am +pkgconfig_DATA = superlu.pc diff -Nur SuperLU_4.1.orig/SRC/Makefile.am SuperLU_4.1/SRC/Makefile.am --- SuperLU_4.1.orig/SRC/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ SuperLU_4.1/SRC/Makefile.am 2010-12-12 18:00:18.000000000 +0000 ++++ SuperLU_4.1/SRC/Makefile.am 2011-03-21 23:42:42.000000000 +0000 @@ -0,0 +1,116 @@ +AM_CPPFLAGS = -DAdd_ + @@ -558,7 +562,7 @@ diff -Nur SuperLU_4.1.orig/SRC/Makefile.am SuperLU_4.1/SRC/Makefile.am +################################## diff -Nur SuperLU_4.1.orig/superlu.pc.in SuperLU_4.1/superlu.pc.in --- SuperLU_4.1.orig/superlu.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ SuperLU_4.1/superlu.pc.in 2010-12-12 17:44:43.000000000 +0000 ++++ SuperLU_4.1/superlu.pc.in 2011-03-21 23:42:42.000000000 +0000 @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ diff --git a/sci-libs/superlu/superlu-4.1-r1.ebuild b/sci-libs/superlu/superlu-4.1-r1.ebuild index f9653b0a039c..b74f9800a48e 100644 --- a/sci-libs/superlu/superlu-4.1-r1.ebuild +++ b/sci-libs/superlu/superlu-4.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.1-r1.ebuild,v 1.1 2010/12/28 20:30:19 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.1-r1.ebuild,v 1.2 2011/03/21 23:49:54 bicatali Exp $ EAPI="2" |