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 CCC65138350 for ; Sat, 1 Feb 2020 11:48:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5373E083E; Sat, 1 Feb 2020 11:48:31 +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 AACA4E083E for ; Sat, 1 Feb 2020 11:48:31 +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 6E94134E40F for ; Sat, 1 Feb 2020 11:48:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03AF68F for ; Sat, 1 Feb 2020 11:48:28 +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: <1580557681.0edd089556150f6d507c4c98487458e55e4720bb.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.41.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 0edd089556150f6d507c4c98487458e55e4720bb X-VCS-Branch: master Date: Sat, 1 Feb 2020 11:48:28 +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: 6948b18d-5687-4271-9b56-82a196bfd89c X-Archives-Hash: a3b1787242c913268c5fd11d0929e5fd commit: 0edd089556150f6d507c4c98487458e55e4720bb Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Feb 1 11:47:10 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Feb 1 11:48:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edd0895 dev-lang/rust: fix libgit2 breakage in 1.41.0 use bundled crate version for now. "amazing" libgit2-sys upstream uses ABI from master and does not work with 0.28.x releases. Bug: https://bugs.gentoo.org/707746 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.41.0.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild index 69e3e04d532..43135125703 100644 --- a/dev-lang/rust/rust-1.41.0.ebuild +++ b/dev-lang/rust/rust-1.41.0.ebuild @@ -60,12 +60,12 @@ LLVM_MAX_SLOT=9 BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" COMMON_DEPEND=" - sys-libs/zlib + net-libs/libssh2:= + net-libs/http-parser:= + net-misc/curl:=[ssl] + sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-libs/http-parser:= - net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( ${LLVM_DEPEND} @@ -132,7 +132,9 @@ pkg_setup() { pre_build_checks python-any-r1_pkg_setup - export LIBGIT2_SYS_USE_PKG_CONFIG=1 + # use bundled for now, #707746 + # will need dev-libs/libgit2 slotted dep if re-enabled + #export LIBGIT2_SYS_USE_PKG_CONFIG=1 export LIBSSH2_SYS_USE_PKG_CONFIG=1 export PKG_CONFIG_ALLOW_CROSS=1