From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D938E139694 for ; Wed, 15 Feb 2017 02:38:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D91E0C08; Wed, 15 Feb 2017 02:38:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFAF4E0C08 for ; Wed, 15 Feb 2017 02:38:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70C1434163E for ; Wed, 15 Feb 2017 02:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D013481C for ; Wed, 15 Feb 2017 02:38:21 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1487126294.24fe73b1ff793e8a9170b0c2f71335d8bd20a258.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/, dev-python/numpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch dev-python/numpy/numpy-1.11.2-r1.ebuild X-VCS-Directories: dev-python/numpy/ dev-python/numpy/files/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 24fe73b1ff793e8a9170b0c2f71335d8bd20a258 X-VCS-Branch: master Date: Wed, 15 Feb 2017 02:38:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 63250274-5e1e-4e3d-9176-3545585446dd X-Archives-Hash: 41a3d16733ee8f42e3c2dbfa1f50bf08 commit: 24fe73b1ff793e8a9170b0c2f71335d8bd20a258 Author: Benda Xu gentoo org> AuthorDate: Wed Feb 15 02:37:58 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Feb 15 02:38:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fe73b1 dev-python/numpy: record include_dirs of blas We specify blas in site.cfg, which could have non-standard include dirs. sci-libs/scikits_learn, for example, relies on this information to find cblas. Upstream: https://github.com/numpy/numpy/pull/8619 Package-Manager: portage-2.3.3 .../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 ++++++++++++++++++++++ dev-python/numpy/numpy-1.11.2-r1.ebuild | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch new file mode 100644 index 0000000000..9a934cc2a4 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch @@ -0,0 +1,24 @@ +commit 61e9159569a601315b67c30b6e26bbb2149c0bfa +Author: Benda Xu +Date: Wed Feb 15 11:17:05 2017 +0900 + + BUG: blas_info should record include_dirs + + blas specified in site.cfg could have non-standard include dirs. + It should be read and saved in distutils/__config__.py + +PR: https://github.com/numpy/numpy/pull/8619 + +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index b8520ac..0fba865 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -1667,6 +1667,8 @@ class blas_info(system_info): + info = self.check_libs(lib_dirs, blas_libs, []) + if info is None: + return ++ else: ++ info['include_dirs'] = self.get_include_dirs() + if platform.system() == 'Windows': + # The check for windows is needed because has_cblas uses the + # same compiler that was used to compile Python and msvc is diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild index 87da9bf152..803872d816 100644 --- a/dev-python/numpy/numpy-1.11.2-r1.ebuild +++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild @@ -37,7 +37,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch - + "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch # This has been fixed upstream but no new release yet # https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa "${FILESDIR}"/${P}-import-module-fix.patch