use openblas.pc for blas and lapack, don't require atlas is to be used

sagemath · Dec 28, 2019 · c031c9e · c031c9e
1 parent b3a8891
commit c031c9e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/build/pkgs/openblas/spkg-configure.m4 b/build/pkgs/openblas/spkg-configure.m4
@@ -1,3 +1,15 @@
 SAGE_SPKG_CONFIGURE([openblas], [
-    PKG_CHECK_MODULES([OPENBLAS], [openblas >= 0.3.5 blas lapack], [], [sage_spkg_install_openblas=yes])
-])
+  PKG_CHECK_MODULES([OPENBLAS], [openblas >= 0.3.5], [
+    PKG_CHECK_VAR([OPENBLASPCDIR], [openblas], [pcfiledir], [
+       AC_CONFIG_LINKS([
+         $SAGE_LOCAL/lib/pkgconfig/blas.pc:$OPENBLASPCDIR/openblas.pc
+         $SAGE_LOCAL/lib/pkgconfig/lapack.pc:$OPENBLASPCDIR/openblas.pc])
+       ], [
+       AC_MSG_WARN([Unable to locate the directory of openblas.pc. This should not happen!])
+       sage_spkg_install_openblas=yes
+       ])
+    ], [sage_spkg_install_openblas=yes])
+  ], [
+  AS_IF([test "x$with_blas" = xopenblas], [sage_require_openblas=yes])
+  ]
+)