diff options
Diffstat (limited to 'academic/spqr/patches/autoconfiscate.diff')
| -rw-r--r-- | academic/spqr/patches/autoconfiscate.diff | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/academic/spqr/patches/autoconfiscate.diff b/academic/spqr/patches/autoconfiscate.diff index ffd9eb9657..8fff318251 100644 --- a/academic/spqr/patches/autoconfiscate.diff +++ b/academic/spqr/patches/autoconfiscate.diff @@ -463,7 +463,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4 new file mode 100644 --- /dev/null +++ b/m4/ax_blas.m4 -@@ -0,0 +1,238 @@ +@@ -0,0 +1,241 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_blas.html +# =========================================================================== @@ -502,6 +502,7 @@ new file mode 100644 +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> ++# Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the @@ -529,7 +530,7 @@ new file mode 100644 +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + -+#serial 16 ++#serial 17 + +AU_ALIAS([ACX_BLAS], [AX_BLAS]) +AC_DEFUN([AX_BLAS], [ @@ -543,7 +544,9 @@ new file mode 100644 +case $with_blas in + yes | "") ;; + no) ax_blas_ok=disable ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;; ++ -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o) ++ BLAS_LIBS="$with_blas" ++ ;; + *) BLAS_LIBS="-l$with_blas" ;; +esac + @@ -982,7 +985,7 @@ diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4 new file mode 100644 --- /dev/null +++ b/m4/ax_lapack.m4 -@@ -0,0 +1,131 @@ +@@ -0,0 +1,134 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lapack.html +# =========================================================================== @@ -1022,6 +1025,7 @@ new file mode 100644 +# LICENSE +# +# Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu> ++# Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the @@ -1049,7 +1053,7 @@ new file mode 100644 +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + -+#serial 9 ++#serial 10 + +AU_ALIAS([ACX_LAPACK], [AX_LAPACK]) +AC_DEFUN([AX_LAPACK], [ @@ -1061,7 +1065,9 @@ new file mode 100644 +case $with_lapack in + yes | "") ;; + no) ax_lapack_ok=disable ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;; ++ -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o) ++ LAPACK_LIBS="$with_lapack" ++ ;; + *) LAPACK_LIBS="-l$with_lapack" ;; +esac + |