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 991DB158041 for ; Wed, 3 Apr 2024 12:30:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CB84E2A6E; Wed, 3 Apr 2024 12:30:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BA4DE2A6E for ; Wed, 3 Apr 2024 12:30:28 +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 A4DE93431EE for ; Wed, 3 Apr 2024 12:30:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2F2914C3 for ; Wed, 3 Apr 2024 12:30:25 +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: <1712146842.eab63f3cad9afcdb07334876409c5b52d7e07ee5.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-1.5.1-r1.ebuild X-VCS-Directories: dev-util/maturin/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: eab63f3cad9afcdb07334876409c5b52d7e07ee5 X-VCS-Branch: master Date: Wed, 3 Apr 2024 12:30:25 +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: 390a54be-ff76-49aa-a408-5129896b38d2 X-Archives-Hash: 56729a3f80e2baf7889faa47732a1ad2 commit: eab63f3cad9afcdb07334876409c5b52d7e07ee5 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Apr 3 12:17:40 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 3 12:20:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab63f3c dev-util/maturin: ensure -march is passed for s390x Fails to build otherwise with: src/arch/zseries_linux.s: Assembler messages: src/arch/zseries_linux.s:49: Error: Unrecognized opcode: `lay' If really needed, there'd be the alternate option to sed /"s390x"/d from psm-*/build.rs, but passing -march is what maturin upstream does as well for their s390x builds. Signed-off-by: Ionen Wolkens gentoo.org> dev-util/maturin/maturin-1.5.1-r1.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-util/maturin/maturin-1.5.1-r1.ebuild b/dev-util/maturin/maturin-1.5.1-r1.ebuild index 81f54669ac75..a692b2fa20a7 100644 --- a/dev-util/maturin/maturin-1.5.1-r1.ebuild +++ b/dev-util/maturin/maturin-1.5.1-r1.ebuild @@ -419,7 +419,7 @@ CRATES_TEST=" " DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( pypy3 python3_{10..12} ) -inherit cargo distutils-r1 shell-completion toolchain-funcs +inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings" HOMEPAGE="https://www.maturin.rs/" @@ -488,6 +488,10 @@ src_prepare() { src_configure() { export OPENSSL_NO_VENDOR=1 + # https://github.com/rust-lang/stacker/issues/79 + use s390 && ! is-flagq '-march=*' && + append-cflags $(test-flags-CC -march=z10) + local myfeatures=( # like release.yml + native-tls for better platform support than rustls full