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

[Antonio Rojas]

    Date: Tuesday, May 3, 2016 @ 21:41:16
  Author: arojas
Revision: 266818

Fix pkgconfig files

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

----------------------------+
 PKGBUILD                   |   10 ++++++---
 lapack-fix-pkgconfig.patch |   46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-03 16:17:22 UTC (rev 266817)
+++ PKGBUILD	2016-05-03 19:41:16 UTC (rev 266818)
@@ -7,7 +7,7 @@
 pkgbase=lapack
 pkgname=('lapack' 'blas' 'cblas' 'lapacke')
 pkgver=3.6.0
-pkgrel=4
+pkgrel=5
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake')
@@ -14,13 +14,17 @@
 arch=('i686' 'x86_64')
 license=("custom")
 source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
-        LICENSE.blas)
+        LICENSE.blas lapack-fix-pkgconfig.patch)
 sha1sums=('7e993de16d80d52b22b6093465eeb90c93c7a2e7'
-          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
+          '2491a151a37f0162b25fc4e4e9a8ac444b574a76'
+          '58d89408ba9d7c3b0058b3132180bc9132bc6112')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -e 's|/CMAKE/|/cmake/|' -i CBLAS/CMakeLists.txt
+
+# Fix pkgconfig files
+  patch -p1 -i ../lapack-fix-pkgconfig.patch
 }
 
 build() {

Added: lapack-fix-pkgconfig.patch
===================================================================
--- lapack-fix-pkgconfig.patch	                        (rev 0)
+++ lapack-fix-pkgconfig.patch	2016-05-03 19:41:16 UTC (rev 266818)
@@ -0,0 +1,46 @@
+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