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 9B7D6138334 for ; Thu, 29 Aug 2019 18:35:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62EA7E0801; Thu, 29 Aug 2019 18:35:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 43EC7E0801 for ; Thu, 29 Aug 2019 18:35:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8135D34A62E for ; Thu, 29 Aug 2019 18:35:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 481536FE for ; Thu, 29 Aug 2019 18:35:51 +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: <1567103247.0d640ada691b569aa2037e3f66f1ed4066efda3a.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/cargo.eclass X-VCS-Directories: eclass/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 0d640ada691b569aa2037e3f66f1ed4066efda3a X-VCS-Branch: master Date: Thu, 29 Aug 2019 18:35:51 +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: c4805e85-3ab6-4e65-a924-1ecc51e9d818 X-Archives-Hash: 59c4e4cedaedb3a080d00500298f5c24 commit: 0d640ada691b569aa2037e3f66f1ed4066efda3a Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Aug 29 05:13:47 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Aug 29 18:27:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d640ada cargo.eclass: add cargo_live_src_unpack() This function will allow using 'cargo fetch' during src_unpack Since only new cargo supports vendoring, all live packages will have to depend on >=rust-1.37.0 This enables us to ship live rust packages, cargo fetch will download all crates and vendor them for offline phases. here's an example of src_unpack() src_unpack() { if [[ "${PV}" == *9999* ]]; then git-r3_src_unpack cargo_live_src_unpack else cargo_src_unpack fi } Signed-off-by: Georgy Yakovlev gentoo.org> eclass/cargo.eclass | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index b16e0e9d633..44d11cdb838 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -12,7 +12,12 @@ if [[ -z ${_CARGO_ECLASS} ]]; then _CARGO_ECLASS=1 -CARGO_DEPEND="virtual/cargo" +if [[ ${PV} == *9999* ]]; then + # we need at least this for cargo vendor subommand + CARGO_DEPEND=">=virtual/cargo-1.37.0" +else + CARGO_DEPEND="virtual/cargo" +fi case ${EAPI} in 6) DEPEND="${CARGO_DEPEND}";; @@ -97,6 +102,26 @@ cargo_src_unpack() { cargo_gen_config } +# @FUNCTION: cargo_live_src_unpack +# @DESCRIPTION: +# Runs 'cargo fetch' and vendors downloaded crates for offline use, used in live ebuilds + +cargo_live_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + [[ "${PV}" == *9999* ]] || die "${FUNCNAME} only allowed in live/9999 ebuilds" + [[ "${EBUILD_PHASE}" == unpack ]] || die "${FUNCNAME} only allowed in src_unpack" + + mkdir -p "${S}" || die + + pushd "${S}" > /dev/null || die + CARGO_HOME="${ECARGO_HOME}" cargo fetch || die + CARGO_HOME="${ECARGO_HOME}" cargo vendor "${ECARGO_VENDOR}" || die + popd > /dev/null || die + + cargo_gen_config +} + # @FUNCTION: cargo_gen_config # @DESCRIPTION: # Generate the $CARGO_HOME/config necessary to use our local registry