Sun Jul 10 23:13:07 UTC 2011

2 files changed, 21 insertions, 45 deletions

diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack
index 6e1f789c7..42579d43a 100644
--- a/extra/lapack/Makefile.lapack
+++ b/extra/lapack/Makefile.lapack
@@ -386,5 +386,5 @@ static: $(ALLOBJ) $(ALLXOBJ)
 	ranlib liblapack.a
 
 shared: $(ALLOBJ) $(ALLXOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
 
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index 6781a930e..ecc002737 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,45 +1,30 @@
-# $Id: PKGBUILD 108944 2011-02-05 09:11:28Z ronald $
+# $Id: PKGBUILD 131048 2011-07-09 21:48:17Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
-pkgbase=lapack
-pkgname=('blas' 'lapack')
-pkgver=3.3.0
+pkgname=lapack
+pkgver=3.3.1
 pkgrel=2
 url="http://www.netlib.org/lapack"
+pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran')
+depends=("blas=${pkgver}")
 arch=('i686' 'x86_64')
 license=("custom")
-source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
+source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
         lapack-3.1.1-make.inc.patch
-        Makefile.blas
-        Makefile.lapack
-        LICENSE.blas)
-md5sums=('84213fca70936cc5f1b59a7b1bf71697'
-         'cdfcb9d9b162c18d9acbf63c5579ea26'
-         '748440ae656402241d053dadb14425ee'
-         'aa359e9b7cc717fb1230cfbb4e1d206b'
-         '38b6acb8ed5691d25863319d30a8b365')
+        Makefile.lapack)
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch"
   cp -f INSTALL/make.inc.gfortran make.inc
-  cp -f "${srcdir}/Makefile.blas" BLAS/SRC/Makefile
   cp -f "${srcdir}/Makefile.lapack" SRC/Makefile
 
   export FC=gfortran
 
-  pushd BLAS/SRC
-  make clean
-  FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o
-  FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared
-  cp libblas.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/"
-  popd
-  ln -s libblas.so.${pkgver} libblas.so
-
   pushd INSTALL
   make clean
   make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC"
@@ -50,35 +35,26 @@ build() {
   make clean
   
   make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared
-  cp liblapack.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/"
+  cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/"
   popd
 }
 
-package_blas() {
-  pkgdesc="Basic Linear Algebra Subprograms"
-  depends=('gcc-libs')
-  options=('force')
+package() {
   install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/${pkgbase}-${pkgver}/libblas.so.${pkgver}" \
-    "${pkgdir}/usr/lib/"
-  ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so"
-  ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so.3"
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/blas"
-  install -m644 "${srcdir}/LICENSE.blas" \
-    "${pkgdir}/usr/share/licenses/blas/LICENSE"
-}
-
-package_lapack() {
-  pkgdesc="Linear Algebra PACKage"
-  depends=("blas=${pkgver}")
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/${pkgbase}-${pkgver}/liblapack.so.${pkgver}" \
+  install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \
     "${pkgdir}/usr/lib/"
   ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so"
   ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
-  install -m644 "${srcdir}/${pkgbase}-${pkgver}/LICENSE" \
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
     "${pkgdir}/usr/share/licenses/lapack/"
 }
+
+sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
+          '71bf7696f1c841339163e82d863dd62e484eb1cf'
+          '128a258fde1b923c0b0b958a8a8ae8aa7657e44b'
+          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
+sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
+          '71bf7696f1c841339163e82d863dd62e484eb1cf'
+          'bbc51c4204cfc6a8aed1a0b61dc39f57ce801e6d')