diff --git a/build/pkgs/cvxopt/spkg-install.in b/build/pkgs/cvxopt/spkg-install.in index 8179125fc9a..1140a482d1a 100644 --- a/build/pkgs/cvxopt/spkg-install.in +++ b/build/pkgs/cvxopt/spkg-install.in @@ -61,9 +61,9 @@ cvxopt_output() { # configure cvxopt by variables # Note that *_INC_DIR variables have to be non-empty. # Compilers don't like "-I ". -export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)" -export CVXOPT_BLAS_LIB_DIR="$(pkg-config --variable=libdir blas)" -export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)" +# export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)" +# export CVXOPT_BLAS_LIB_DIR="$(pkg-config --variable=libdir blas)" +# export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)" if test "x$SAGE_SUITESPARSE_PREFIX" != "x"; then export CVXOPT_SUITESPARSE_LIB_DIR="${SAGE_SUITESPARSE_PREFIX}" diff --git a/build/pkgs/fflas_ffpack/spkg-install.in b/build/pkgs/fflas_ffpack/spkg-install.in index b9dd851875f..8fda3e0807c 100644 --- a/build/pkgs/fflas_ffpack/spkg-install.in +++ b/build/pkgs/fflas_ffpack/spkg-install.in @@ -1,3 +1,4 @@ +export LINBOX_BLAS='-framework Accelerate' cd src if [ "$LINBOX_BLAS" != "" ]; then diff --git a/build/pkgs/linbox/spkg-install.in b/build/pkgs/linbox/spkg-install.in index 7acc5547e9f..3c69075a480 100644 --- a/build/pkgs/linbox/spkg-install.in +++ b/build/pkgs/linbox/spkg-install.in @@ -1,3 +1,4 @@ +export LINBOX_BLAS='-framework Accelerate' cd src/ ############################################################################### diff --git a/build/pkgs/openblas/spkg-configure.m4 b/build/pkgs/openblas/spkg-configure.m4 index 94175da210b..db11acdb4b3 100644 --- a/build/pkgs/openblas/spkg-configure.m4 +++ b/build/pkgs/openblas/spkg-configure.m4 @@ -1,4 +1,6 @@ SAGE_SPKG_CONFIGURE([openblas], [dnl CHECK + AC_CHECK_HEADER([Accelerate/Accelerate.h], [dnl macOS + ], [ SAGE_SPKG_DEPCHECK([gfortran], [dnl SAVE_LIBS="$LIBS" SAVE_CFLAGS="$CFLAGS" @@ -128,4 +130,5 @@ SAGE_SPKG_CONFIGURE([openblas], [dnl CHECK LIBS="$SAVE_LIBS" CFLAGS="$SAVE_CFLAGS" ]) + ]) ]) diff --git a/build/pkgs/scipy/spkg-install.in b/build/pkgs/scipy/spkg-install.in index 37c4e972358..5c0a1c05dd4 100644 --- a/build/pkgs/scipy/spkg-install.in +++ b/build/pkgs/scipy/spkg-install.in @@ -3,8 +3,4 @@ export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g') cd src/ -# mesonpy enforces the build-system requirements, including the strict version pins of numpy -# even when --no-isolation (--no-build-isolation) is in used. We patch it out. -sed -i.bak '/build-system/,/project/s/^ *"numpy.*/ "numpy",/' pyproject.toml - -sdh_pip_install --no-build-isolation . +sdh_pip_install --no-build-isolation . -Csetup-args=-Dblas=accelerate diff --git a/build/platform/macos/pkgconfig/blas.pc b/build/platform/macos/pkgconfig/blas.pc new file mode 100644 index 00000000000..6d6ad688bfc --- /dev/null +++ b/build/platform/macos/pkgconfig/blas.pc @@ -0,0 +1,6 @@ +Name: blas +Description: Apple blas +Version: 42.0 +URL: https://apple.com +Cflags: +Libs: -framework Accelerate diff --git a/build/platform/macos/pkgconfig/cblas.pc b/build/platform/macos/pkgconfig/cblas.pc new file mode 100644 index 00000000000..6d6ad688bfc --- /dev/null +++ b/build/platform/macos/pkgconfig/cblas.pc @@ -0,0 +1,6 @@ +Name: blas +Description: Apple blas +Version: 42.0 +URL: https://apple.com +Cflags: +Libs: -framework Accelerate diff --git a/build/platform/macos/pkgconfig/lapack.pc b/build/platform/macos/pkgconfig/lapack.pc new file mode 100644 index 00000000000..6d6ad688bfc --- /dev/null +++ b/build/platform/macos/pkgconfig/lapack.pc @@ -0,0 +1,6 @@ +Name: blas +Description: Apple blas +Version: 42.0 +URL: https://apple.com +Cflags: +Libs: -framework Accelerate diff --git a/build/platform/macos/pkgconfig/openblas.pc b/build/platform/macos/pkgconfig/openblas.pc new file mode 100644 index 00000000000..6d6ad688bfc --- /dev/null +++ b/build/platform/macos/pkgconfig/openblas.pc @@ -0,0 +1,6 @@ +Name: blas +Description: Apple blas +Version: 42.0 +URL: https://apple.com +Cflags: +Libs: -framework Accelerate