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.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 40A6A158094 for ; Thu, 28 Jul 2022 14:05:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67942E0D78; Thu, 28 Jul 2022 14:05:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0154EE0D78 for ; Thu, 28 Jul 2022 14:05:08 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAE7E340961 for ; Thu, 28 Jul 2022 14:05:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27C86545 for ; Thu, 28 Jul 2022 14:05:06 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1659016954.df2f0bafac3657579f2be99174448007b0df35d8.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/maturin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/maturin/maturin-0.13.2_beta1.ebuild X-VCS-Directories: dev-util/maturin/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: df2f0bafac3657579f2be99174448007b0df35d8 X-VCS-Branch: master Date: Thu, 28 Jul 2022 14:05:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dda58c8e-95a0-40ad-a5e9-3f8c3f3751b5 X-Archives-Hash: e804e4b2853eb1b2610c62d633fa4a67 commit: df2f0bafac3657579f2be99174448007b0df35d8 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Jul 28 13:55:55 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jul 28 14:02:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2f0baf dev-util/maturin: sync riscv check in _beta1 Not needed now, but next bump will be based on _beta1's conditions and don't want to forget it. At this point it's tempting to just disable it for all arches except amd64/x86/arm*, but upstream keeps a similar per-arch exclusion list so keeping as-is for now. Also move filter-lto in the right phase since it's defined. Signed-off-by: Ionen Wolkens gentoo.org> dev-util/maturin/maturin-0.13.2_beta1.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/maturin/maturin-0.13.2_beta1.ebuild b/dev-util/maturin/maturin-0.13.2_beta1.ebuild index 923cbd019f20..4432c450ae14 100644 --- a/dev-util/maturin/maturin-0.13.2_beta1.ebuild +++ b/dev-util/maturin/maturin-0.13.2_beta1.ebuild @@ -387,17 +387,17 @@ src_prepare() { # TODO: package-agnostic way to handle IUSE=debug with setuptools-rust? use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die - filter-lto # undefined references with ring crate - # setup.py handles most for non-tests, but ensure disabled rustls on arches # where ring crate is problematic -- keep in sync below (bug #859577) - if use mips || use ppc || use ppc64 || use s390 || use sparc; then + if use mips || use ppc || use ppc64 || use riscv || use s390 || use sparc; then sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die fi } src_configure() { - if use mips || use ppc || use ppc64 || use s390 || use sparc; then + filter-lto # undefined references with ring crate + + if use mips || use ppc || use ppc64 || use riscv || use s390 || use sparc; then local myfeatures=( upload log human-panic ) cargo_src_configure --no-default-features fi