From a49e671db3cb083497d76ab04440e9f05eac1338 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 4 Dec 2003 09:13:58 +0000 Subject: Now uses libtool and makes shared libraries --- math/blas/Makefile | 32 +++++++++++----------- math/blas/PLIST | 7 +++-- math/blas/buildlink2.mk | 3 +-- math/blas/distinfo | 3 ++- math/blas/files/Makefile | 66 ---------------------------------------------- math/blas/patches/patch-aa | 40 ++++++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 88 deletions(-) delete mode 100644 math/blas/files/Makefile create mode 100644 math/blas/patches/patch-aa (limited to 'math/blas') diff --git a/math/blas/Makefile b/math/blas/Makefile index f4433d7dc3e..f9713555566 100644 --- a/math/blas/Makefile +++ b/math/blas/Makefile @@ -1,24 +1,22 @@ -# $NetBSD: Makefile,v 1.13 2003/11/19 16:16:47 adam Exp $ +# $NetBSD: Makefile,v 1.14 2003/12/04 09:13:58 adam Exp $ # -DISTNAME= blas -PKGNAME= blas-1.0 -PKGREVISION= 1 -WRKSRC= ${WRKDIR} -CATEGORIES= math -MASTER_SITES= ftp://ftp.netlib.org/blas/ \ - ftp://netlib.bell-labs.com/netlib/blas/ \ - ftp://www.hensa.ac.uk/mirrors/netlib/blas/ -EXTRACT_SUFX= .tgz +DISTNAME= blas +PKGNAME= blas-1.0 +PKGREVISION= 2 +WRKSRC= ${WRKDIR} +CATEGORIES= math +MASTER_SITES= ftp://ftp.netlib.org/blas/ \ + ftp://netlib.bell-labs.com/netlib/blas/ \ + ftp://www.hensa.ac.uk/mirrors/netlib/blas/ +EXTRACT_SUFX= .tgz -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.netlib.org/blas/ -COMMENT= Basic Linear Algebra Subprograms (Fortran) +MAINTAINER= adam@NetBSD.org +HOMEPAGE= http://www.netlib.org/blas/ +COMMENT= Basic Linear Algebra Subprograms (Fortran) -USE_FORTRAN= YES USE_BUILDLINK2= YES - -post-extract: - ${CP} ${FILESDIR}/Makefile ${WRKSRC} +USE_FORTRAN= YES +USE_LIBTOOL= YES .include "../../mk/bsd.pkg.mk" diff --git a/math/blas/PLIST b/math/blas/PLIST index d8f264e2a2a..f1abda1f686 100644 --- a/math/blas/PLIST +++ b/math/blas/PLIST @@ -1,3 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2003/03/11 01:46:29 jmc Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/12/04 09:13:58 adam Exp $ lib/libblas.a -lib/libblas_pic.a +lib/libblas.la +lib/libblas.so +lib/libblas.so.1 +lib/libblas.so.1.0 diff --git a/math/blas/buildlink2.mk b/math/blas/buildlink2.mk index 1eb193e91bc..ce4792837e6 100644 --- a/math/blas/buildlink2.mk +++ b/math/blas/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/03/28 20:29:43 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/12/04 09:13:58 adam Exp $ .if !defined(BLAS_BUILDLINK2_MK) BLAS_BUILDLINK2_MK= # defined @@ -6,7 +6,6 @@ BLAS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= blas BUILDLINK_DEPENDS.blas?= blas>=1.0 BUILDLINK_PKGSRCDIR.blas?= ../../math/blas -BUILDLINK_DEPMETHOD.blas?= build EVAL_PREFIX+= BUILDLINK_PREFIX.blas=blas BUILDLINK_PREFIX.blas_DEFAULT= ${LOCALBASE} diff --git a/math/blas/distinfo b/math/blas/distinfo index eac54064e4b..cdb16bc86ad 100644 --- a/math/blas/distinfo +++ b/math/blas/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:38 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/12/04 09:13:58 adam Exp $ SHA1 (blas.tgz) = ab73fcc69d0c74888aea67a698f60cd91b0d3af2 Size (blas.tgz) = 94981 bytes +SHA1 (patch-aa) = 3cd451255a12bb50ab6247c9431f3f6c176fe46b diff --git a/math/blas/files/Makefile b/math/blas/files/Makefile deleted file mode 100644 index 22047d0ec94..00000000000 --- a/math/blas/files/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -.SUFFIXES: .so - -LIB = blas - -LIBDIR = ${PREFIX}/lib - -all: lib$(LIB).a lib$(LIB)_pic.a - -OBJS = caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o \ - cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o \ - chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o \ - csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o \ - ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o daxpy.o dcabs1.o \ - dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o \ - drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o dspr.o \ - dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o dsyr2k.o dsyrk.o \ - dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o \ - dzasum.o dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o \ - sasum.o saxpy.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \ - sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \ - srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o ssymm.o \ - ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o stpmv.o \ - stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o zaxpy.o \ - zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o zgemm.o \ - zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o zher2.o \ - zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o zswap.o \ - zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o \ - ztrmm.o ztrmv.o ztrsm.o ztrsv.o - -PIC_OBJS = caxpy.so ccopy.so cdotc.so cdotu.so cgbmv.so cgemm.so cgemv.so cgerc.so \ - cgeru.so chbmv.so chemm.so chemv.so cher.so cher2.so cher2k.so cherk.so \ - chpmv.so chpr.so chpr2.so crotg.so cscal.so csrot.so csscal.so cswap.so \ - csymm.so csyr2k.so csyrk.so ctbmv.so ctbsv.so ctpmv.so ctpsv.so \ - ctrmm.so ctrmv.so ctrsm.so ctrsv.so dasum.so daxpy.so dcabs1.so \ - dcopy.so ddot.so dgbmv.so dgemm.so dgemv.so dger.so dnrm2.so drot.so \ - drotg.so drotm.so drotmg.so dsbmv.so dscal.so dsdot.so dspmv.so dspr.so \ - dspr2.so dswap.so dsymm.so dsymv.so dsyr.so dsyr2.so dsyr2k.so dsyrk.so \ - dtbmv.so dtbsv.so dtpmv.so dtpsv.so dtrmm.so dtrmv.so dtrsm.so dtrsv.so \ - dzasum.so dznrm2.so icamax.so idamax.so isamax.so izamax.so lsame.so \ - sasum.so saxpy.so scasum.so scnrm2.so scopy.so sdot.so sdsdot.so \ - sgbmv.so sgemm.so sgemv.so sger.so snrm2.so srot.so srotg.so srotm.so \ - srotmg.so ssbmv.so sscal.so sspmv.so sspr.so sspr2.so sswap.so ssymm.so \ - ssymv.so ssyr.so ssyr2.so ssyr2k.so ssyrk.so stbmv.so stbsv.so stpmv.so \ - stpsv.so strmm.so strmv.so strsm.so strsv.so xerbla.so zaxpy.so \ - zcopy.so zdotc.so zdotu.so zdrot.so zdscal.so zgbmv.so zgemm.so \ - zgemv.so zgerc.so zgeru.so zhbmv.so zhemm.so zhemv.so zher.so zher2.so \ - zher2k.so zherk.so zhpmv.so zhpr.so zhpr2.so zrotg.so zscal.so zswap.so \ - zsymm.so zsyr2k.so zsyrk.so ztbmv.so ztbsv.so ztpmv.so ztpsv.so \ - ztrmm.so ztrmv.so ztrsm.so ztrsv.so - -lib$(LIB).a: $(OBJS) - $(AR) cru $@ $? - $(RANLIB) $@ - -lib$(LIB)_pic.a: $(PIC_OBJS) - $(AR) cru $@ $? - $(RANLIB) $@ - -install: lib$(LIB).a lib$(LIB)_pic.a - $(BSD_INSTALL_DATA) $? $(LIBDIR) - -clean: - rm -f *.o lib$(LIB).a - -.f.so: - ${COMPILE.f} -fPIC -o $@ $< diff --git a/math/blas/patches/patch-aa b/math/blas/patches/patch-aa new file mode 100644 index 00000000000..cf3a1744a2e --- /dev/null +++ b/math/blas/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.1 2003/12/04 09:13:58 adam Exp $ + +--- /dev/null 2003-11-20 10:35:58.000000000 +0100 ++++ Makefile +@@ -0,0 +1,35 @@ ++LIB = blas ++ ++all: lib$(LIB).a ++ ++OBJS = caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o \ ++ cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o \ ++ chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o \ ++ csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o \ ++ ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o daxpy.o dcabs1.o \ ++ dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o \ ++ drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o dspr.o \ ++ dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o dsyr2k.o dsyrk.o \ ++ dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o \ ++ dzasum.o dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o \ ++ sasum.o saxpy.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \ ++ sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \ ++ srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o ssymm.o \ ++ ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o stpmv.o \ ++ stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o zaxpy.o \ ++ zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o zgemm.o \ ++ zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o zher2.o \ ++ zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o zswap.o \ ++ zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o \ ++ ztrmm.o ztrmv.o ztrsm.o ztrsv.o ++ ++.f.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${COMPILE.f} ${.IMPSRC} ++ ++lib$(LIB).a: $(OBJS) ++ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} \ ++ -rpath ${PREFIX}/lib -version-info 1:0 ++ ++install: lib$(LIB).a ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${.ALLSRC:.a=.la} \ ++ ${PREFIX}/lib -- cgit v1.2.3