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

[Ronald van Haren]

    Date: Wednesday, February 4, 2009 @ 06:02:04
  Author: ronald
Revision: 26246

Merged revisions 26242,26244 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/lapack/trunk

........
  r26242 | ronald | 2009-02-04 11:52:15 +0100 (Wed, 04 Feb 2009) | 1 line
  
  upgpkg: lapack 3.2-2
........
  r26244 | ronald | 2009-02-04 11:54:17 +0100 (Wed, 04 Feb 2009) | 1 line
  
  fix md5sums
........

Modified:
  lapack/repos/extra-i686/	(properties)
  lapack/repos/extra-i686/PKGBUILD
  lapack/repos/extra-i686/blas-link.patch

-----------------+
 PKGBUILD        |   14 +++++++++-----
 blas-link.patch |   20 ++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)


Property changes on: lapack/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /lapack/trunk:1-22974
   + /lapack/trunk:1-26245

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-04 10:54:44 UTC (rev 26245)
+++ extra-i686/PKGBUILD	2009-02-04 11:02:04 UTC (rev 26246)
@@ -5,24 +5,28 @@
 
 pkgname=lapack
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Linear Algebra PACKage"
 url="http://www.netlib.org/lapack"
 arch=('i686' 'x86_64')
 license=("custom")
 depends=('blas>=20070405-2')
 source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
-	make.inc.archlinux)
+	make.inc.archlinux blas-link.patch)
 md5sums=('db2e9b01bd157b65440f8306c0ba5446'
-         'cc368c407e396227c473db5bac92cf02')
+         'cc368c407e396227c473db5bac92cf02'
+         'd396697499466389f5bbea6b5ec9b489')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib" || return 1
-  install -m755 -d "${pkgdir}/usr/share/man/man1" || return 1
+  install -d "${pkgdir}/usr/lib" || return 1
+  # install -d "${pkgdir}/usr/share/man/man1" || return 1
 
   cp "${srcdir}/make.inc.archlinux" make.inc || return 1
   
+  # fix blas linking FS#13093
+  patch -Np1 -i ${srcdir}/blas-link.patch || return 1
+   
   # Build with Position Independent Code (PIC) FS#12464 (i686), required for x86_64
   CFLAGS="${CFLAGS} -fPIC"
 

Modified: extra-i686/blas-link.patch
===================================================================
--- extra-i686/blas-link.patch	2009-02-04 10:54:44 UTC (rev 26245)
+++ extra-i686/blas-link.patch	2009-02-04 11:02:04 UTC (rev 26246)
@@ -1,18 +1,18 @@
-diff -ru lapack-3.1.1/SRC/Makefile lapack-3.1.1.patched/SRC/Makefile
---- lapack-3.1.1/SRC/Makefile	2007-02-23 22:33:05.000000000 +0100
-+++ lapack-3.1.1.patched/SRC/Makefile	2008-11-03 11:49:54.000000000 +0100
-@@ -294,7 +294,7 @@
+diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile
+--- lapack-3.2.old/SRC/Makefile	2009-02-04 11:33:35.006839507 +0100
++++ lapack-3.2/SRC/Makefile	2009-02-04 11:33:51.987551506 +0100
+@@ -367,7 +367,7 @@
  	$(ALLAUX)
  
- ../$(LAPACKLIB): $(ALLOBJ)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) -lblas
+ ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
+-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
++	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) -lblas
  	$(RANLIB) $@
  
  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
-diff -ru lapack-3.1.1/TESTING/MATGEN/Makefile lapack-3.1.1.patched/TESTING/MATGEN/Makefile
---- lapack-3.1.1/TESTING/MATGEN/Makefile	2007-02-20 22:33:03.000000000 +0100
-+++ lapack-3.1.1.patched/TESTING/MATGEN/Makefile	2008-11-03 11:53:15.000000000 +0100
+diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Makefile
+--- lapack-3.2.old/TESTING/MATGEN/Makefile	2009-02-04 11:35:10.426806473 +0100
++++ lapack-3.2/TESTING/MATGEN/Makefile	2009-02-04 11:34:42.850565181 +0100
 @@ -60,7 +60,7 @@
  
  ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)	\