From 738cdf66f1fd7fcfa7c690c2dab2767f04ddfa49 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 10 Jul 2020 23:39:29 -0400 Subject: [PATCH] python3-scipy: update to 1.5.1. --- srcpkgs/python3-scipy/template | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 3d602c347c..90b4b1b8a1 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,13 +1,13 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.5.0 +version=1.5.1 revision=2 wrksrc="scipy-${version}" build_style=python3-module +build_helper="numpy" make_check_args="--force" -hostmakedepends="gcc-fortran python3-setuptools - python3-Cython python3-numpy python3-pybind11" -makedepends="python3-devel python3-numpy python3-pybind11 +hostmakedepends="gcc-fortran python3-setuptools python3-Cython python3-pybind11" +makedepends="python3-devel python3-pybind11 $(vopt_if openblas openblas-devel lapack-devel)" depends="python3-numpy" checkdepends="python3-nose" @@ -16,7 +16,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://scipy.org/scipylib/" distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz" -checksum=23baeaa18803d12d1abdff3f5c148b1085c2dc4028c6b8efce652dde2119b41c +checksum=0728bd66a5251cfeff17a72280ae5a40ec14add217f94868d1415b3c469b610a build_options="openblas" desc_option_openblas="Enable support for openblas accelerated linear algebra" @@ -29,25 +29,9 @@ case "$XBPS_TARGET_MACHINE" in *) ;; esac -if [ "$CROSS_BUILD" ]; then - # Make sure numpy is found for the target arch first - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/lib" - - # Tell numpy.distutils where to find FORTRAN compilers - export F77="${FC}" - export F90="${FC}" -fi - LDFLAGS+=" -shared" pre_build() { - if [ "$CROSS_BUILD" ]; then - # numpy.distutils refuses to find the right linker for FORTRAN - # Link the cross compiler so the module will find it as gfortran - ln -sf "/usr/bin/${FC}" "${XBPS_WRAPPERDIR}/gfortran" - fi - # Find the right linear algebra subroutines on the target arch : > site.cfg for _blaslib in $(vopt_if openblas openblas "lapack blas"); do