[arch-commits] Commit in lapack/trunk (PKGBUILD lapack-fix-pkgconfig.patch)

[Antonio Rojas]

    Date: Monday, September 5, 2016 @ 11:46:17
  Author: arojas
Revision: 275773

Fix cblas and lapacke .pc files (FS#50052)

Modified:
  lapack/trunk/PKGBUILD
Deleted:
  lapack/trunk/lapack-fix-pkgconfig.patch

----------------------------+
 PKGBUILD                   |   14 ++++++++++---
 lapack-fix-pkgconfig.patch |   46 -------------------------------------------
 2 files changed, 11 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-05 11:37:18 UTC (rev 275772)
+++ PKGBUILD	2016-09-05 11:46:17 UTC (rev 275773)
@@ -7,16 +7,24 @@
 pkgbase=lapack
 pkgname=('lapack' 'blas' 'cblas' 'lapacke')
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake' 'python')
 arch=('i686' 'x86_64')
 license=("custom")
-source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz LICENSE.blas)
+source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz LICENSE.blas
+        fix-pkgconfig.patch::"https://github.com/Reference-LAPACK/lapack/commit/e0975e7b.patch")
 sha1sums=('7220a9bc9c766cb513007f313b804d88f110c228'
-          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
+          '2491a151a37f0162b25fc4e4e9a8ac444b574a76'
+          '75635a902bbe8813337bbebe6becf301d0973ee7')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix cblas and lapacke .pc files
+  patch -p1 -i ../fix-pkgconfig.patch
+}
+
 build() {
   install -d build
   cd build

Deleted: lapack-fix-pkgconfig.patch
===================================================================
--- lapack-fix-pkgconfig.patch	2016-09-05 11:37:18 UTC (rev 275772)
+++ lapack-fix-pkgconfig.patch	2016-09-05 11:46:17 UTC (rev 275773)
@@ -1,46 +0,0 @@
-From b5a386540793536bec214254d21b404c5f64040b Mon Sep 17 00:00:00 2001
-From: julie <julie at 8a072113-8704-0410-8d35-dd094bca7971>
-Date: Wed, 2 Mar 2016 04:00:38 +0000
-Subject: [PATCH] Fix for pkgconfig files lapack.pc, blas.pc - PATCH sent by
- Christoph Conrads on March 1st 2016
-
-git-svn-id: https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk@1733 8a072113-8704-0410-8d35-dd094bca7971
----
- BLAS/blas.pc.in | 6 +++---
- lapack.pc.in    | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 845a25c..b8963c5 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,9 +1,9 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
- Version: @LAPACK_VERSION@
- URL: http://www.netlib.org/blas/
--Libs: -L${libdir} -lblas
-+Libs: -L at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lblas
- Libs.private: -lm
-diff --git a/lapack.pc.in b/lapack.pc.in
-index d34c870..4d4fe01 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,9 +1,9 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
- Version: @LAPACK_VERSION@
- URL: http://www.netlib.org/lapack/
--Libs: -L${libdir} -llapack
-+Libs: -L at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -llapack
- Requires: blas