Received: by mail.netbsd.org (Postfix, from userid 605) id E9D5884DAD; Thu, 25 Mar 2021 21:47:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 30BDE84D27 for ; Thu, 25 Mar 2021 21:47:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id y6EVxVJFiMlB for ; Thu, 25 Mar 2021 21:47:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8C01584CF1 for ; Thu, 25 Mar 2021 21:47:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7927EFA95; Thu, 25 Mar 2021 21:47:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161670887038720" MIME-Version: 1.0 Date: Thu, 25 Mar 2021 21:47:50 +0000 From: "Dr. Thomas Orgis" Subject: CVS commit: pkgsrc/math/py-numpy To: pkgsrc-changes@NetBSD.org Reply-To: thor@netbsd.org X-Mailer: log_accum Message-Id: <20210325214750.7927EFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161670887038720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: thor Date: Thu Mar 25 21:47:50 UTC 2021 Modified Files: pkgsrc/math/py-numpy: Makefile buildlink3.mk distinfo Log Message: math/py-numpy: Actually use BLAS_LIBS and LAPACK_LIBS. The previous state included our BLAS choice but the build did not honour the selected libs. This patches the config script to not search for LAPACK and BLAS, using our settings instead. Hopefull we can get that option upstreamed. Approved during freeze by wiz. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 pkgsrc/math/py-numpy/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/py-numpy/buildlink3.mk cvs rdiff -u -r1.56 -r1.57 pkgsrc/math/py-numpy/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161670887038720 Content-Disposition: inline Content-Length: 2740 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-numpy/Makefile diff -u pkgsrc/math/py-numpy/Makefile:1.74 pkgsrc/math/py-numpy/Makefile:1.75 --- pkgsrc/math/py-numpy/Makefile:1.74 Sat Jan 9 09:29:41 2021 +++ pkgsrc/math/py-numpy/Makefile Thu Mar 25 21:47:50 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2021/01/09 09:29:41 adam Exp $ +# $NetBSD: Makefile,v 1.75 2021/03/25 21:47:50 thor Exp $ DISTNAME= numpy-1.19.5 +PKGREVISION= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} @@ -18,6 +19,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9] # error: 'for' loop initial declarations are only allowed in C99 mode USE_LANGUAGES= c99 fortran MAKE_ENV+= ATLAS=None +MAKE_ENV+= BLAS_LIBS=${BLAS_LIBS:Q} LAPACK_LIBS=${LAPACK_LIBS:Q} REPLACE_PYTHON+= *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py Index: pkgsrc/math/py-numpy/buildlink3.mk diff -u pkgsrc/math/py-numpy/buildlink3.mk:1.7 pkgsrc/math/py-numpy/buildlink3.mk:1.8 --- pkgsrc/math/py-numpy/buildlink3.mk:1.7 Tue Oct 13 17:32:16 2020 +++ pkgsrc/math/py-numpy/buildlink3.mk Thu Mar 25 21:47:50 2021 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2020/10/13 17:32:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2021/03/25 21:47:50 thor Exp $ BUILDLINK_TREE+= py-numpy @@ -18,6 +18,10 @@ BUILDLINK_PKGSRCDIR.py-numpy?= ../../ma .include "../../mk/bsd.fast.prefs.mk" +# Dependend python packages re-use the BLAS_LIBS logic and +# need this in the environment. +MAKE_ENV+= BLAS_LIBS=${BLAS_LIBS:Q} LAPACK_LIBS=${LAPACK_LIBS:Q} + .if ${OPSYS} != "Darwin" .include "../../mk/blas.buildlink3.mk" .endif Index: pkgsrc/math/py-numpy/distinfo diff -u pkgsrc/math/py-numpy/distinfo:1.56 pkgsrc/math/py-numpy/distinfo:1.57 --- pkgsrc/math/py-numpy/distinfo:1.56 Sat Jan 9 09:29:41 2021 +++ pkgsrc/math/py-numpy/distinfo Thu Mar 25 21:47:50 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2021/01/09 09:29:41 adam Exp $ +$NetBSD: distinfo,v 1.57 2021/03/25 21:47:50 thor Exp $ SHA1 (numpy-1.19.5.zip) = 61f0b3dad58ce97b14da9dccbee0722d36f26937 RMD160 (numpy-1.19.5.zip) = 3317c98790e8c2d1d9c36279b3451f09b6776935 @@ -7,5 +7,5 @@ Size (numpy-1.19.5.zip) = 7318340 bytes SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1d62e1c5e35de0f2cf975de38f62df7f10c71d74 -SHA1 (patch-numpy_distutils_system__info.py) = 01879a0ad3c5eb0133fcce46ce10a52cdd3df7a4 +SHA1 (patch-numpy_distutils_system__info.py) = 5f43d3108175dadc96a65b734c234d0b95053173 SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8 --_----------=_161670887038720--