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

[Ronald van Haren]

    Date: Tuesday, December 30, 2008 @ 05:19:03
  Author: ronald
Revision: 22967

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

........
  r18339 | jgc | 2008-11-04 08:32:39 +0100 (Tue, 04 Nov 2008) | 2 lines
  
  Add missing file
........
  r22966 | ronald | 2008-12-30 11:18:25 +0100 (Tue, 30 Dec 2008) | 1 line
  
  upgpkg: blas 20070405-2
........

Added:
  blas/repos/extra-x86_64/make.inc
    (from rev 22966, blas/trunk/make.inc)
Modified:
  blas/repos/extra-x86_64/	(properties)
  blas/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 make.inc |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-30 10:18:25 UTC (rev 22966)
+++ extra-x86_64/PKGBUILD	2008-12-30 10:19:03 UTC (rev 22967)
@@ -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
 }

Copied: blas/repos/extra-x86_64/make.inc (from rev 22966, blas/trunk/make.inc)
===================================================================
--- extra-x86_64/make.inc	                        (rev 0)
+++ extra-x86_64/make.inc	2008-12-30 10:19:03 UTC (rev 22967)
@@ -0,0 +1,34 @@
+####################################################################
+#  BLAS make include file.                                         #
+#  March 2007                                                      #
+####################################################################
+#
+SHELL = /bin/sh
+#
+#  The machine (platform) identifier to append to the library names
+#
+PLAT = _LINUX
+#  
+#  Modify the FORTRAN and OPTS definitions to refer to the
+#  compiler and desired compiler options for your machine.  NOOPT
+#  refers to the compiler options desired when NO OPTIMIZATION is
+#  selected.  Define LOADER and LOADOPTS to refer to the loader and 
+#  desired load options for your machine.
+#
+FORTRAN  = gfortran
+OPTS     = -O2
+DRVOPTS  = $(OPTS)
+NOOPT    = -O0
+LOADER   = gfortran
+LOADOPTS =
+#
+#  The archiver and the flag(s) to use when building archive (library)
+#  If you system has no ranlib, set RANLIB = echo.
+#
+ARCH     = gfortran
+ARCHFLAGS= -shared -o
+RANLIB   = echo
+#
+#  The location and name of the Reference BLAS library.
+#
+BLASLIB      = libblas.so.3.0.3