summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-02-01 03:47:10 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-02-01 03:48:01 -0800
commit0edd089556150f6d507c4c98487458e55e4720bb (patch)
tree69fb714271efe8a71123375e6061f0f5b47f065e
parentsys-kernel/gentoo-sources: Linux patch 5.5.1 (diff)
downloadgentoo-0edd089556150f6d507c4c98487458e55e4720bb.tar.gz
gentoo-0edd089556150f6d507c4c98487458e55e4720bb.tar.bz2
gentoo-0edd089556150f6d507c4c98487458e55e4720bb.zip
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 <gyakovlev@gentoo.org>
-rw-r--r--dev-lang/rust/rust-1.41.0.ebuild12
1 files 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