Tue Aug 12 21:29:11 2008 UTC ()
Tell libtool that its linking fortran so the correct libraries get
linked in.


(markd)
diff -r1.24 -r1.25 pkgsrc/math/blas/Makefile
diff -r1.1 -r1.2 pkgsrc/math/blas/files/Makefile.blas
cvs diff -r1.24 -r1.25 pkgsrc/math/blas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/blas/Makefile 2008/03/07 07:14:24 1.24
+++ pkgsrc/math/blas/Makefile 2008/08/12 21:29:11 1.25
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.24 2008/03/07 07:14:24 jlam Exp $ 1# $NetBSD: Makefile,v 1.25 2008/08/12 21:29:11 markd Exp $
2# 2#
3 3
4DISTNAME= blas 4DISTNAME= blas
5PKGNAME= blas-1.1 5PKGNAME= blas-1.1
 6PKG_REVISION= 1
6CATEGORIES= math 7CATEGORIES= math
7MASTER_SITES= ftp://ftp.netlib.org/blas/ 8MASTER_SITES= ftp://ftp.netlib.org/blas/
8EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
9 10
10MAINTAINER= adam@NetBSD.org 11MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://www.netlib.org/blas/ 12HOMEPAGE= http://www.netlib.org/blas/
12COMMENT= Basic Linear Algebra Subprograms (Fortran) 13COMMENT= Basic Linear Algebra Subprograms (Fortran)
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17DIST_SUBDIR= ${PKGNAME_NOREV} 18DIST_SUBDIR= ${PKGNAME_NOREV}
18WRKSRC= ${WRKDIR}/BLAS 19WRKSRC= ${WRKDIR}/BLAS
cvs diff -r1.1 -r1.2 pkgsrc/math/blas/files/Attic/Makefile.blas (expand / switch to unified diff)

--- pkgsrc/math/blas/files/Attic/Makefile.blas 2008/03/07 07:14:24 1.1
+++ pkgsrc/math/blas/files/Attic/Makefile.blas 2008/08/12 21:29:11 1.2
@@ -18,21 +18,21 @@ OBJS= caxpy.o ccopy.o cdotc.o cdotu.o cg @@ -18,21 +18,21 @@ OBJS= caxpy.o ccopy.o cdotc.o cdotu.o cg
18 stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o \ 18 stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o \
19 zaxpy.o zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o \ 19 zaxpy.o zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o \
20 zgemm.o zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o \ 20 zgemm.o zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o \
21 zher2.o zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o \ 21 zher2.o zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o \
22 zswap.o zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o \ 22 zswap.o zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o \
23 ztpsv.o ztrmm.o ztrmv.o ztrsm.o ztrsv.o 23 ztpsv.o ztrmm.o ztrmv.o ztrsm.o ztrsv.o
24 24
25all: libblas.la 25all: libblas.la
26 26
27.f.o: 27.f.o:
28 ${LIBTOOL} --mode=compile --tag=CC ${COMPILE.f} ${.IMPSRC} 28 ${LIBTOOL} --mode=compile --tag=CC ${COMPILE.f} ${.IMPSRC}
29 29
30libblas.la: $(OBJS) 30libblas.la: $(OBJS)
31 ${LIBTOOL} --mode=link ${CC} -o ${.TARGET} ${OBJS:.o=.lo} \ 31 ${LIBTOOL} --mode=link --tag=F77 ${FC} -o ${.TARGET} ${OBJS:.o=.lo} \
32 -rpath $(libdir) \ 32 -rpath $(libdir) \
33 -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR} 33 -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
34 34
35install: libblas.la 35install: libblas.la
36 ${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(libdir) 36 ${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(libdir)
37 ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libblas.la \ 37 ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libblas.la \
38 ${DESTDIR}$(libdir) 38 ${DESTDIR}$(libdir)