[arch-commits] Commit in blas/repos (3 files)

[Jan de Groot]

    Date: Monday, November 3, 2008 @ 05:42:12
  Author: jgc
Revision: 18130

Merged revisions 18129 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/blas/trunk

........
  r18129 | jgc | 2008-11-03 11:41:55 +0100 (Mon, 03 Nov 2008) | 2 lines
  
  upgpkg: blas 20070405-1
      Fix FS#11308 (and possibly 9905 which was maybe already fixed)
........

Modified:
  blas/repos/extra-x86_64/	(properties)
  blas/repos/extra-x86_64/PKGBUILD
Deleted:
  blas/repos/extra-x86_64/Makefile

----------+
 Makefile |   30 ------------------------------
 PKGBUILD |   38 ++++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 48 deletions(-)


Property changes on: blas/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /blas/trunk:1-1815
   + /blas/trunk:1-18129

Deleted: extra-x86_64/Makefile
===================================================================
--- extra-x86_64/Makefile	2008-11-03 10:41:55 UTC (rev 18129)
+++ extra-x86_64/Makefile	2008-11-03 10:42:12 UTC (rev 18130)
@@ -1,30 +0,0 @@
-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 scabs1.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
-
-static: 	$(OBJS)
-	ar cru libblas.a $(OBJS)
-	ranlib libblas.a
-
-clean:
-	rm -f *.o libblas.a
-
-shared: $(OBJS)
-	cc -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.0.3 *.o -lm -lc

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-03 10:41:55 UTC (rev 18129)
+++ extra-x86_64/PKGBUILD	2008-11-03 10:42:12 UTC (rev 18130)
@@ -4,32 +4,34 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=blas
-pkgver=19980702
-pkgrel=5
+pkgver=20070405
+pkgrel=1
 pkgdesc="Basic Linear Algebra Subprograms"
 arch=('i686' 'x86_64')
 url="http://www.netlib.org/blas"
 license=('custom')
-depends=('glibc')
-source=(http://www.netlib.org/blas/blas.tgz Makefile license.txt)
+depends=('gcc-libs>=4.3.2')
+source=(http://www.netlib.org/blas/blas.tgz
+	make.inc
+	license.txt)
+md5sums=('7e6af7022440d8688d16be86d55fb358'
+         'c9822d4699733bdee98f417565181f9c'
+         '38b6acb8ed5691d25863319d30a8b365')
 
 build() {
-  cd ${startdir}/src/BLAS
-  export FFLAGS="${CFLAGS}"
+  cd "${srcdir}/BLAS"
   if [ "${CARCH}" = "x86_64" ]; then
-    FFLAGS="${FFLAGS} -fPIC"
+    CFLAGS="${CFLAGS} -fPIC"
   fi
-  cp ${startdir}/src/Makefile ${startdir}/src/BLAS/
-  FC="gfortran" FFLAGS="${FFLAGS}" make static shared || return 1
+  cp "${srcdir}/make.inc" "${srcdir}/BLAS/" || return 1
+  make OPTS="${CFLAGS}" NOOPT="${CFLAGS/-O?/-O0}" || return 1
 
-  install -D -m644 libblas.a ${startdir}/pkg/usr/lib/libblas.a
-  install -D -m755 libblas.so.3.0.3 ${startdir}/pkg/usr/lib/libblas.so.3.0.3
-  ln -s libblas.so.3.0.3 ${startdir}/pkg/usr/lib/libblas.so
-  ln -s libblas.so.3.0.3 ${startdir}/pkg/usr/lib/libblas.so.3 
+  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 libblas.so.3.0.3 "${pkgdir}/usr/lib/" || return 1
+  ln -sf libblas.so.3.0.3 "${pkgdir}/usr/lib/libblas.so"
+  ln -sf libblas.so.3.0.3 "${pkgdir}/usr/lib/libblas.so.3"
+
   # install license
-  install -m755 -d ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -D -m644 ${startdir}/src/license.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('7e6af7022440d8688d16be86d55fb358'
-         '62b2fa8c1f3967b02926cc452193f27b'
-         '38b6acb8ed5691d25863319d30a8b365')