| 1 |
jlec 11/11/24 11:01:47 |
| 2 |
|
| 3 |
Modified: 1.5-linking.patch |
| 4 |
Log: |
| 5 |
Use cleanly pkg-config to detect blas |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sci-libs/punc/files/1.5-linking.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/files/1.5-linking.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/files/1.5-linking.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/files/1.5-linking.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: 1.5-linking.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/punc/files/1.5-linking.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- 1.5-linking.patch 17 Apr 2011 09:12:22 -0000 1.2 |
| 23 |
+++ 1.5-linking.patch 24 Nov 2011 11:01:47 -0000 1.3 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
- configure.ac | 29 ++++++++++++----------------- |
| 26 |
+ configure.ac | 35 +++++++++++++++++------------------ |
| 27 |
src/aaa_lib/Makefile.am | 7 +++---- |
| 28 |
src/pmg/Makefile.am | 1 + |
| 29 |
- 3 files changed, 16 insertions(+), 21 deletions(-) |
| 30 |
+ 3 files changed, 21 insertions(+), 22 deletions(-) |
| 31 |
|
| 32 |
diff --git a/configure.ac b/configure.ac |
| 33 |
-index 1295a9f..e996eb0 100644 |
| 34 |
+index 1295a9f..f8fd97c 100644 |
| 35 |
--- a/configure.ac |
| 36 |
+++ b/configure.ac |
| 37 |
@@ -49,6 +49,8 @@ AC_LANG_C |
| 38 |
@@ -16,16 +16,36 @@ |
| 39 |
AM_PROG_LIBTOOL |
| 40 |
|
| 41 |
dnl 3. checks for libraries |
| 42 |
-@@ -358,7 +360,7 @@ else |
| 43 |
+@@ -341,6 +343,10 @@ if test -n "${blas}"; then |
| 44 |
+ else |
| 45 |
+ AC_MSG_RESULT([no ...poking around]) |
| 46 |
+ |
| 47 |
++ PKG_CHECK_MODULES([BLAS],[blas],[ |
| 48 |
++ blas_lib=${BLAS_LIBS} |
| 49 |
++ blas="" |
| 50 |
++ ],[ |
| 51 |
+ dnl # BLAS library location ENV specification |
| 52 |
+ AC_MSG_CHECKING([whether your environment defines FETK_BLAS_LIBRARY]) |
| 53 |
+ if test -n "${FETK_BLAS_LIBRARY}"; then |
| 54 |
+@@ -358,7 +364,7 @@ else |
| 55 |
AC_CHECK_LIB(blas,dscal_, |
| 56 |
[blas_use="yes";blas_lib="${blas_lib_path}-lblas"], |
| 57 |
[blas_use="";blas_lib=""], |
| 58 |
- [${blas_lib_path}-lblas -lvf2c]) |
| 59 |
-+ [${blas_lib_path}-lblas]) |
| 60 |
++ [${blas_lib_path} $(BLAS_LIBS)]) |
| 61 |
if test -z "${blas_use}"; then |
| 62 |
AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) |
| 63 |
blas="blas"; |
| 64 |
-@@ -414,7 +416,7 @@ dnl lapack_use=""; |
| 65 |
+@@ -368,7 +374,7 @@ else |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
+ dnl # Return LDFLAGS to normal |
| 69 |
+- LDFLAGS=${LDFLAGS_SAVE}; |
| 70 |
++ LDFLAGS=${LDFLAGS_SAVE};]) |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
+ dnl # Final decisions on BLAS |
| 74 |
+@@ -414,7 +420,7 @@ dnl lapack_use=""; |
| 75 |
dnl AC_CHECK_LIB(lapack,dsysv_, |
| 76 |
dnl [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], |
| 77 |
dnl [lapack_use="";lapack_lib=""], |
| 78 |
@@ -34,7 +54,7 @@ |
| 79 |
dnl if test -z "${lapack_use}"; then |
| 80 |
dnl AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) |
| 81 |
dnl lapack="lapack"; |
| 82 |
-@@ -466,10 +468,10 @@ else |
| 83 |
+@@ -466,10 +472,10 @@ else |
| 84 |
LDFLAGS_SAVE=${LDFLAGS}; |
| 85 |
LDFLAGS=${amd_lib_path}; |
| 86 |
amd_use=""; |
| 87 |
@@ -47,7 +67,7 @@ |
| 88 |
if test -z "${amd_use}"; then |
| 89 |
AC_MSG_RESULT([** AMD library missing ...will BUILD **]) |
| 90 |
amd="amd"; |
| 91 |
-@@ -521,10 +523,10 @@ else |
| 92 |
+@@ -521,10 +527,10 @@ else |
| 93 |
LDFLAGS_SAVE=${LDFLAGS}; |
| 94 |
LDFLAGS=${umfpack_lib_path}; |
| 95 |
umfpack_use=""; |
| 96 |
@@ -60,7 +80,7 @@ |
| 97 |
if test -z "${umfpack_use}"; then |
| 98 |
AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **]) |
| 99 |
umfpack="umfpack"; |
| 100 |
-@@ -579,7 +581,7 @@ else |
| 101 |
+@@ -579,7 +585,7 @@ else |
| 102 |
AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, |
| 103 |
[superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], |
| 104 |
[superlu_use="";superlu_lib=""], |
| 105 |
@@ -69,7 +89,7 @@ |
| 106 |
if test -z "${superlu_use}"; then |
| 107 |
AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) |
| 108 |
superlu="superlu"; |
| 109 |
-@@ -635,7 +637,7 @@ dnl arpack_use=""; |
| 110 |
+@@ -635,7 +641,7 @@ dnl arpack_use=""; |
| 111 |
dnl AC_CHECK_LIB(arpack,dsgets_, |
| 112 |
dnl [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], |
| 113 |
dnl [arpack_use="";arpack_lib=""], |
| 114 |
@@ -78,7 +98,7 @@ |
| 115 |
dnl if test -z "${arpack_use}"; then |
| 116 |
dnl AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) |
| 117 |
dnl arpack="arpack"; |
| 118 |
-@@ -691,7 +693,7 @@ dnl cgcode_use=""; |
| 119 |
+@@ -691,7 +697,7 @@ dnl cgcode_use=""; |
| 120 |
dnl AC_CHECK_LIB(cgcode,scgdrv_, |
| 121 |
dnl [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"], |
| 122 |
dnl [cgcode_use="";cgcode_lib=""], |
| 123 |
@@ -87,7 +107,7 @@ |
| 124 |
dnl if test -z "${cgcode_use}"; then |
| 125 |
dnl AC_MSG_RESULT([** CGCODE library missing ...will BUILD **]) |
| 126 |
dnl cgcode="cgcode"; |
| 127 |
-@@ -747,7 +749,7 @@ dnl pmg_use=""; |
| 128 |
+@@ -747,7 +753,7 @@ dnl pmg_use=""; |
| 129 |
dnl AC_CHECK_LIB(pmg,buildg_, |
| 130 |
dnl [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], |
| 131 |
dnl [pmg_use="";pmg_lib=""], |
| 132 |
@@ -96,7 +116,7 @@ |
| 133 |
dnl if test -z "${pmg_use}"; then |
| 134 |
dnl AC_MSG_RESULT([** PMG library missing ...will BUILD **]) |
| 135 |
dnl pmg="pmg"; |
| 136 |
-@@ -986,13 +988,6 @@ AC_OUTPUT([ |
| 137 |
+@@ -986,13 +992,6 @@ AC_OUTPUT([ |
| 138 |
src/base/Makefile |
| 139 |
|
| 140 |
src/vf2c/Makefile |
Archives