summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authoradam <adam>2003-12-04 10:32:30 +0000
committeradam <adam>2003-12-04 10:32:30 +0000
commitec51685a11ce23898837034ccbae33e430b2359b (patch)
tree41ac54fb7393081dccd9795acc42bbebf9660bda /math
parentc038c5410773cee90839cb0f248c9b8c07b9ee49 (diff)
downloadpkgsrc-ec51685a11ce23898837034ccbae33e430b2359b.tar.gz
Now uses libtool and makes shared libraries
Diffstat (limited to 'math')
-rw-r--r--math/lapack/Makefile40
-rw-r--r--math/lapack/PLIST6
-rw-r--r--math/lapack/distinfo5
-rw-r--r--math/lapack/patches/patch-aa58
-rw-r--r--math/lapack/patches/patch-ab49
5 files changed, 78 insertions, 80 deletions
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index af832bfeb8f..cfb938ebe38 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:47:43 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/04 10:32:30 adam Exp $
+#
-DISTNAME= lapack
-PKGNAME= lapack-20010201
-WRKSRC= ${WRKDIR}/LAPACK
-CATEGORIES= math
-MASTER_SITES= ftp://ftp.netlib.org/lapack/ \
- ftp://netlib.bell-labs.com/netlib/lapack/ \
- ftp://www.hensa.ac.uk/mirrors/netlib/lapack/ \
- ftp://netlib.no/netlib/lapack/ \
- ftp://ftp.zib.de/netlib/lapack/
-EXTRACT_SUFX= .tgz
+DISTNAME= lapack
+PKGNAME= lapack-20010201
+PKGREVISION= 1
+WRKSRC= ${WRKDIR}/LAPACK
+CATEGORIES= math
+MASTER_SITES= ftp://ftp.netlib.org/lapack/ \
+ ftp://netlib.bell-labs.com/netlib/lapack/ \
+ ftp://www.hensa.ac.uk/mirrors/netlib/lapack/ \
+ ftp://netlib.no/netlib/lapack/ \
+ ftp://ftp.zib.de/netlib/lapack/
+EXTRACT_SUFX= .tgz
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.netlib.org/lapack/index.html
-COMMENT= Linear Algebra PACKage
+MAINTAINER= adam@NetBSD.org
+HOMEPAGE= http://www.netlib.org/lapack/index.html
+COMMENT= Linear Algebra PACKage
DIST_SUBDIR= lapack-20010201
-USE_FORTRAN= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK2= YES
+USE_FORTRAN= YES
+USE_LIBTOOL= YES
+ALL_TARGET= lapacklib
do-install:
- ${INSTALL_DATA} ${WRKSRC}/liblapack.a ${PREFIX}/lib
+ ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/liblapack.la \
+ ${PREFIX}/lib
-.include "../../math/blas/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/lapack/PLIST b/math/lapack/PLIST
index 7202915c345..a46cc24017b 100644
--- a/math/lapack/PLIST
+++ b/math/lapack/PLIST
@@ -1,2 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:33 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/04 10:32:30 adam Exp $
lib/liblapack.a
+lib/liblapack.la
+lib/liblapack.so
+lib/liblapack.so.3
+lib/liblapack.so.3.0
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index bf34f79e75a..900183aa0b0 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/05/03 22:44:04 jtb Exp $
+$NetBSD: distinfo,v 1.6 2003/12/04 10:32:30 adam Exp $
SHA1 (lapack-20010201/lapack.tgz) = 47d85508d87d60e32b613ef0c951d0be4bf10e72
Size (lapack-20010201/lapack.tgz) = 4991992 bytes
-SHA1 (patch-aa) = 523854177f1f91d7ad6eed9e61b9f69895e10f0a
-SHA1 (patch-ab) = b96dae9628481b1fdc5e9faf53711929511540c6
+SHA1 (patch-aa) = 234db1695338dd0c6178949534396700e9e557d5
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index d3ead837b4b..8cb8adea731 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,13 +1,53 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/01 23:30:56 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/04 10:32:30 adam Exp $
---- Makefile.orig Wed May 17 17:33:22 2000
-+++ Makefile
-@@ -6,7 +6,7 @@
+--- SRC/Makefile.orig 1999-11-04 20:26:09.000000000 +0100
++++ SRC/Makefile
+@@ -280,24 +280,24 @@ ZLASRC = \
+ all: single complex double complex16
- include make.inc
+ single: $(SLASRC) $(ALLAUX) $(SCLAUX)
+- $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
+- $(SCLAUX)
+- $(RANLIB) ../$(LAPACKLIB)
++ ${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la \
++ $(SLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo) \
++ -rpath ${PREFIX}/lib -version-info 3:0
--all: install lib testing blas_testing timing blas_timing
-+all: install lapacklib
+ complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
+- $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
+- $(SCLAUX)
+- $(RANLIB) ../$(LAPACKLIB)
++ ${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la \
++ $(CLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo) \
++ -rpath ${PREFIX}/lib -version-info 3:0
- lib: lapacklib tmglib
- #lib: blaslib lapacklib tmglib
+ double: $(DLASRC) $(ALLAUX) $(DZLAUX)
+- $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
+- $(DZLAUX)
+- $(RANLIB) ../$(LAPACKLIB)
++ ${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la \
++ $(DLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(DZLAUX:.o=.lo) \
++ -rpath ${PREFIX}/lib -version-info 3:0
+
+ complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
+- $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
+- $(DZLAUX)
+- $(RANLIB) ../$(LAPACKLIB)
++ ${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la \
++ $(ZLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(DZLAUX:.o=.lo) \
++ -rpath ${PREFIX}/lib -version-info 3:0
+
+ $(ALLAUX): $(FRC)
+ $(SCLAUX): $(FRC)
+@@ -313,10 +313,6 @@ FRC:
+ clean:
+ rm -f *.o
+
+-slamch.o: slamch.f
+- $(FORTRAN) $(NOOPT) -c $<
+-dlamch.o: dlamch.f
+- $(FORTRAN) $(NOOPT) -c $<
+
+ .f.o:
+- $(FORTRAN) $(OPTS) -c $<
++ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $<
diff --git a/math/lapack/patches/patch-ab b/math/lapack/patches/patch-ab
deleted file mode 100644
index 4f2b9ab797c..00000000000
--- a/math/lapack/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/05/03 22:44:04 jtb Exp $
-
---- make.inc.orig Thu Nov 4 14:23:14 1999
-+++ make.inc Mon Apr 30 21:15:38 2001
-@@ -9,5 +9,5 @@
- # The machine (platform) identifier to append to the library names
- #
--PLAT = _SUN4SOL2
-+PLAT =
- #
- # Modify the FORTRAN and OPTS definitions to refer to the
-@@ -17,21 +17,21 @@
- # desired load options for your machine.
- #
--FORTRAN = f77
-+FORTRAN = $(FC)
- #OPTS = -O4 -u -f -mt
- #OPTS = -u -f -dalign -native -xO5 -xarch=v8plusa
--OPTS = -u -f -dalign -native -xO5 -xarch=v8plusa
-+OPTS = $(FFLAGS)
- DRVOPTS = $(OPTS)
--NOOPT = -u -f
-+NOOPT =
- #NOOPT = -u -f -mt
--LOADER = f77
-+LOADER = $(FC)
- #LOADOPTS = -mt
--LOADOPTS = -f -dalign -native -xO5 -xarch=v8plusa
-+LOADOPTS = $(LDFLAGS)
- #
- # The archiver and the flag(s) to use when building archive (library)
- # If you system has no ranlib, set RANLIB = echo.
- #
--ARCH = ar
-+ARCH = $(AR)
- ARCHFLAGS= cr
--RANLIB = echo
-+#RANLIB = echo
- #
- # The location of the libraries to which you will link. (The
-@@ -41,6 +41,6 @@
- #BLASLIB = ../../blas$(PLAT).a
- #BLASLIB = -xlic_lib=sunperf_mt
--BLASLIB = -xlic_lib=sunperf
--LAPACKLIB = lapack$(PLAT).a
-+BLASLIB = -Wl,-R${BUILDLINK_PREFIX.blas}/lib -L${BUILDLINK_PREFIX.blas}/lib -lblas
-+LAPACKLIB = liblapack.a
- TMGLIB = tmglib$(PLAT).a
- EIGSRCLIB = eigsrc$(PLAT).a