[arch-commits] Commit in blas/repos (extra-i686 extra-i686/PKGBUILD)

[Ronald van Haren]

    Date: Tuesday, December 30, 2008 @ 06:27:09
  Author: ronald
Revision: 22974

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

........
  r22966 | ronald | 2008-12-30 11:18:25 +0100 (Tue, 30 Dec 2008) | 1 line
  
  upgpkg: blas 20070405-2
........

Modified:
  blas/repos/extra-i686/	(properties)
  blas/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


Property changes on: blas/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /blas/trunk:1-18383
   + /blas/trunk:1-22973

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-30 11:24:27 UTC (rev 22973)
+++ extra-i686/PKGBUILD	2008-12-30 11:27:09 UTC (rev 22974)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
-# Community Maintainer: Eric Belanger <belanger at astro.umontreal.ca>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir <damir.archlinux.org>
+# Contributor: Eric Belanger <belanger at astro.umontreal.ca>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=blas
 pkgver=20070405
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic Linear Algebra Subprograms"
 arch=('i686' 'x86_64')
 url="http://www.netlib.org/blas"
@@ -20,9 +21,10 @@
 
 build() {
   cd "${srcdir}/BLAS"
-  if [ "${CARCH}" = "x86_64" ]; then
-    CFLAGS="${CFLAGS} -fPIC"
-  fi
+  
+  # Build with Position Independent Code (PIC) FS#12464 (i686), required for x86_64
+  CFLAGS="${CFLAGS} -fPIC"
+
   cp "${srcdir}/make.inc" "${srcdir}/BLAS/" || return 1
   make OPTS="${CFLAGS}" NOOPT="${CFLAGS/-O?/-O0}" || return 1
 
@@ -31,7 +33,7 @@
   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 ${pkgdir}/usr/share/licenses/${pkgname}
+  # Install custom license
+  install -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }