[arch-commits] Commit in lapack/trunk (Makefile.lapack PKGBUILD)

[Ronald van Haren]

    Date: Saturday, July 9, 2011 @ 17:48:17
  Author: ronald
Revision: 131048

upgpkg: lapack 3.3.1-2
fix linking to blas

Modified:
  lapack/trunk/Makefile.lapack
  lapack/trunk/PKGBUILD

-----------------+
 Makefile.lapack |    2 -
 PKGBUILD        |   64 ++++++++++++++----------------------------------------
 2 files changed, 18 insertions(+), 48 deletions(-)

Modified: Makefile.lapack
===================================================================
--- Makefile.lapack	2011-07-09 21:46:02 UTC (rev 131047)
+++ Makefile.lapack	2011-07-09 21:48:17 UTC (rev 131048)
@@ -386,5 +386,5 @@
 	ranlib liblapack.a
 
 shared: $(ALLOBJ) $(ALLXOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.0 $(ALLOBJ) -L.. -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-09 21:46:02 UTC (rev 131047)
+++ PKGBUILD	2011-07-09 21:48:17 UTC (rev 131048)
@@ -4,44 +4,27 @@
 # Contributor: damir <damir at archlinux.org>
 # Contributor: Jason Taylor <jftaylor21 at gmail.com>
 
-pkgbase=lapack
-pkgname=('blas' 'lapack')
+pkgname=lapack
 pkgver=3.3.1
-_sover=3.3.0
-pkgrel=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)
-sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
-          '71bf7696f1c841339163e82d863dd62e484eb1cf'
-          '47f46f83ad9a82b6539e040298a143baee6543fd'
-          '128a258fde1b923c0b0b958a8a8ae8aa7657e44b'
-          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
+        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.${_sover} "${srcdir}/${pkgbase}-${pkgver}/"
-
-  popd
-  ln -s libblas.so.${_blasver} libblas.so
-
   pushd INSTALL
   make clean
   make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC"
@@ -52,39 +35,26 @@
   make clean
   
   make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared
-  cp liblapack.so.${_sover} "${srcdir}/${pkgbase}-${pkgver}/"
+  cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/"
   popd
 }
 
-package_blas() {
-  pkgdesc="Basic Linear Algebra Subprograms"
-  depends=('gcc-libs')
+package() {
   install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/${pkgbase}-${pkgver}/libblas.so.${_sover}" \
+  install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \
     "${pkgdir}/usr/lib/"
-  ln -sf libblas.so.${_sover} "${pkgdir}/usr/lib/libblas.so"
-  ln -sf libblas.so.${_sover} "${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"
-}
+  ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so"
+  ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3"
 
-package_lapack() {
-  pkgdesc="Linear Algebra PACKage"
-  depends=("blas=${pkgver}")
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/${pkgbase}-${pkgver}/liblapack.so.${_sover}" \
-    "${pkgdir}/usr/lib/"
-  ln -sf liblapack.so.${_sover} "${pkgdir}/usr/lib/liblapack.so"
-  ln -sf liblapack.so.${_sover} "${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'
-          '47f46f83ad9a82b6539e040298a143baee6543fd'
           '128a258fde1b923c0b0b958a8a8ae8aa7657e44b'
           '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
+sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
+          '71bf7696f1c841339163e82d863dd62e484eb1cf'
+          'bbc51c4204cfc6a8aed1a0b61dc39f57ce801e6d')