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 10A9013835A for ; Wed, 25 Nov 2020 20:17:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B5EAE087B; Wed, 25 Nov 2020 20:17:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22640E087B for ; Wed, 25 Nov 2020 20:17:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF2F13412E1 for ; Wed, 25 Nov 2020 20:17:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D86D450 for ; Wed, 25 Nov 2020 20:17:46 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1606335222.05db0379f704e23dd855663c5696ce8aaf895f51.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.48.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 05db0379f704e23dd855663c5696ce8aaf895f51 X-VCS-Branch: master Date: Wed, 25 Nov 2020 20:17:46 +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: 2acba0f8-0eb3-47a2-8431-28848c2bf737 X-Archives-Hash: f49d0245cee682e9b43e31405572b37e commit: 05db0379f704e23dd855663c5696ce8aaf895f51 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Nov 25 20:06:40 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Nov 25 20:13:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05db0379 dev-lang/rust: sync changes to 1.48 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.48.0.ebuild | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dev-lang/rust/rust-1.48.0.ebuild b/dev-lang/rust/rust-1.48.0.ebuild index d89b0fa8404..44306e55963 100644 --- a/dev-lang/rust/rust-1.48.0.ebuild +++ b/dev-lang/rust/rust-1.48.0.ebuild @@ -58,7 +58,19 @@ LLVM_DEPEND=" " LLVM_MAX_SLOT=11 -BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" +# to bootstrap we need at least exactly previos version, or same. +# most of the time previous versions fail to bootstrap with newer +# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok, +# but it fails to bootstrap with 1.48.x +# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt +BOOTSTRAP_DEPEND="|| + ( + =dev-lang/rust-$(ver_cut 1).$(($(ver_cut 2) - 1))* + =dev-lang/rust-bin-$(ver_cut 1).$(($(ver_cut 2) - 1))* + =dev-lang/rust-$(ver_cut 1).$(ver_cut 2)* + =dev-lang/rust-bin-$(ver_cut 1).$(ver_cut 2)* + ) +" BDEPEND="${PYTHON_DEPS} app-eselect/eselect-rust @@ -74,7 +86,7 @@ BDEPEND="${PYTHON_DEPS} " DEPEND=" - >=dev-libs/libgit2-1.1.0:= + >=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) @@ -85,7 +97,7 @@ DEPEND=" ) " -# we need to block versions older than 1.47.0 due to layout changes. +# we need to block older versions due to layout changes. RDEPEND="${DEPEND} app-eselect/eselect-rust !/dev/null) ) rustc_version=${rustc_version[0]#rust-bin-} rustc_version=${rustc_version#rust-} - [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!" + [[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output" if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then eerror "Rust >=${rustc_wanted} is required" - eerror "please run \'eselect rust\' and set correct rust version" - die + eerror "please run 'eselect rust' and set correct rust version" + die "selected rust version is too old" + elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then + eerror "Rust <${rustc_toonew} is required" + eerror "please run 'eselect rust' and set correct rust version" + die "selected rust version is too new" else einfo "Using rust ${rustc_version} to build" fi @@ -178,6 +195,8 @@ pkg_setup() { pre_build_checks python-any-r1_pkg_setup + export LIBGIT2_NO_PKG_CONFIG=1 #749381 + use system-bootstrap && boostrap_rust_version_check if use system-llvm; then