From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1591084-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F18B015838C
for <garchives@archives.gentoo.org>; Tue, 16 Jan 2024 05:48:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 41C67E2BB2;
Tue, 16 Jan 2024 05:48:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0DF41E2BAF
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 05:48:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 58E403432A0
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 05:47:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EE9CB11A0
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 05:47:57 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1705384065.8c8e5446966b720e8c28d153932d801764dab28a.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/scipy/scipy-1.11.3-r1.ebuild dev-python/scipy/scipy-1.11.4.ebuild
X-VCS-Directories: dev-python/scipy/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8c8e5446966b720e8c28d153932d801764dab28a
X-VCS-Branch: master
Date: Tue, 16 Jan 2024 05:47:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 196c817a-410c-4948-ae79-7565a1461e15
X-Archives-Hash: 6e12622718830e3fbda67f61d79198a1
commit: 8c8e5446966b720e8c28d153932d801764dab28a
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 16 05:18:55 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 05:47:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8e5446
dev-python/scipy: filter LTO since it is unsafe
The underlying issue is really just a lot of old fortran code. Not all
compiled modules are actually LTO-unsafe. But handling this granularly
requires good cooperation with the build system. I handled this upstream
via https://github.com/scipy/scipy/pull/19857.
While we wait for scipy 1.13.0 to be released, prevent older scipy
versions from using LTO.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/scipy/scipy-1.11.3-r1.ebuild | 5 ++++-
dev-python/scipy/scipy-1.11.4.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild
index 9f68cd59364e..53cfef682124 100644
--- a/dev-python/scipy/scipy-1.11.3-r1.ebuild
+++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=meson-python
PYTHON_COMPAT=( pypy3 python3_{10..12} )
PYTHON_REQ_USE="threads(+)"
-inherit fortran-2 distutils-r1 multiprocessing
+inherit flag-o-matic fortran-2 distutils-r1 multiprocessing
DESCRIPTION="Scientific algorithms library for Python"
HOMEPAGE="
@@ -87,6 +87,9 @@ src_unpack() {
}
python_configure_all() {
+ # https://github.com/scipy/scipy/pull/19857
+ # Fixed in 1.13.0
+ filter-lto
DISTUTILS_ARGS=(
-Dblas=blas
-Dlapack=lapack
diff --git a/dev-python/scipy/scipy-1.11.4.ebuild b/dev-python/scipy/scipy-1.11.4.ebuild
index eb69b66541e5..9d60b95cd5e7 100644
--- a/dev-python/scipy/scipy-1.11.4.ebuild
+++ b/dev-python/scipy/scipy-1.11.4.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=meson-python
PYTHON_COMPAT=( pypy3 python3_{10..12} )
PYTHON_REQ_USE="threads(+)"
-inherit fortran-2 distutils-r1 multiprocessing
+inherit flag-o-matic fortran-2 distutils-r1 multiprocessing
DESCRIPTION="Scientific algorithms library for Python"
HOMEPAGE="
@@ -87,6 +87,9 @@ src_unpack() {
}
python_configure_all() {
+ # https://github.com/scipy/scipy/pull/19857
+ # Fixed in 1.13.0
+ filter-lto
DISTUTILS_ARGS=(
-Dblas=blas
-Dlapack=lapack