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 42D4715800F for ; Wed, 15 Feb 2023 19:23:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9091BE08A0; Wed, 15 Feb 2023 19:23:11 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77842E08A0 for ; Wed, 15 Feb 2023 19:23:11 +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 9AD88340E52 for ; Wed, 15 Feb 2023 19:23:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 219F48AB for ; Wed, 15 Feb 2023 19:23:09 +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: <1676488978.2ea439c9cf9d2d24853401e7b28bc56532ba7c6b.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.0.0_beta1-r1.ebuild X-VCS-Directories: dev-util/maturin/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 2ea439c9cf9d2d24853401e7b28bc56532ba7c6b X-VCS-Branch: master Date: Wed, 15 Feb 2023 19:23:09 +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: ddf276ba-95b8-489f-835f-3ff0b6ed9e76 X-Archives-Hash: 8f3d7890de8dcebd7f188be8d504a3de commit: 2ea439c9cf9d2d24853401e7b28bc56532ba7c6b Author: Ionen Wolkens gentoo org> AuthorDate: Wed Feb 15 17:03:31 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 15 19:22:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea439c9 dev-util/maturin: switch to native-tls Upstream also package it using native-tls on e.g. alpine where they maintain it themselves, while rustls seem favored for general prebuilt binaries on pypi/github. This saves from platform support headaches and also makes the build a bit quicker given can use the system lib. Also expose as a USE for the dependency, disabling is fine if not using to upload projects using https. Signed-off-by: Ionen Wolkens gentoo.org> dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild b/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild index c3aba92597fc..2336baf2beae 100644 --- a/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild +++ b/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild @@ -410,31 +410,28 @@ SRC_URI=" test? ( $(cargo_crate_uris ${CRATES_TEST}) )" S="${WORKDIR}/${P/_beta/-beta.}" +# note: ring is unused, so SSLeay+openssl licenses can be skipped LICENSE=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD - CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl - doc? ( CC-BY-4.0 OFL-1.1 )" + 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC + MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )" SLOT="0" # unkeyworded beta for testing #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="doc +ssl test" RESTRICT="!test? ( test )" -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{9..10} pypy3)" +RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.{9,10})" +DEPEND="ssl? ( dev-libs/openssl:= )" BDEPEND=" dev-python/setuptools-rust[${PYTHON_USEDEP}] doc? ( app-text/mdbook ) test? ( ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/cffi[${PYTHON_USEDEP}] - ' 'python*') + $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') dev-python/boltons[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] )" +RDEPEND+=" ${DEPEND}" QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -455,14 +452,12 @@ src_configure() { local cargoargs=( $(usev debug '--profile dev') --no-default-features - --features full,password-storage # see release.yml + # like release.yml + native-tls for better platform support than rustls + --features full,password-storage$(usev ssl ,native-tls) ) - # rustls needs ring crate that only works on specific arches (bug #859577) - use amd64 || use x86 || use arm64 || use arm && - cargoargs+=(--features rustls) - export MATURIN_SETUP_ARGS=${cargoargs[*]} # --no-default-features if empty + export OPENSSL_NO_VENDOR=1 } python_compile_all() {