| 1 |
commit: 0edd089556150f6d507c4c98487458e55e4720bb |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 11:47:10 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 11:48:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edd0895 |
| 7 |
|
| 8 |
dev-lang/rust: fix libgit2 breakage in 1.41.0 |
| 9 |
|
| 10 |
use bundled crate version for now. |
| 11 |
"amazing" libgit2-sys upstream uses ABI from master and |
| 12 |
does not work with 0.28.x releases. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/707746 |
| 15 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-lang/rust/rust-1.41.0.ebuild | 12 +++++++----- |
| 19 |
1 file changed, 7 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild |
| 22 |
index 69e3e04d532..43135125703 100644 |
| 23 |
--- a/dev-lang/rust/rust-1.41.0.ebuild |
| 24 |
+++ b/dev-lang/rust/rust-1.41.0.ebuild |
| 25 |
@@ -60,12 +60,12 @@ LLVM_MAX_SLOT=9 |
| 26 |
BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" |
| 27 |
|
| 28 |
COMMON_DEPEND=" |
| 29 |
- sys-libs/zlib |
| 30 |
+ net-libs/libssh2:= |
| 31 |
+ net-libs/http-parser:= |
| 32 |
+ net-misc/curl:=[ssl] |
| 33 |
+ sys-libs/zlib:= |
| 34 |
!libressl? ( dev-libs/openssl:0= ) |
| 35 |
libressl? ( dev-libs/libressl:0= ) |
| 36 |
- net-libs/libssh2 |
| 37 |
- net-libs/http-parser:= |
| 38 |
- net-misc/curl[ssl] |
| 39 |
elibc_musl? ( sys-libs/libunwind ) |
| 40 |
system-llvm? ( |
| 41 |
${LLVM_DEPEND} |
| 42 |
@@ -132,7 +132,9 @@ pkg_setup() { |
| 43 |
pre_build_checks |
| 44 |
python-any-r1_pkg_setup |
| 45 |
|
| 46 |
- export LIBGIT2_SYS_USE_PKG_CONFIG=1 |
| 47 |
+ # use bundled for now, #707746 |
| 48 |
+ # will need dev-libs/libgit2 slotted dep if re-enabled |
| 49 |
+ #export LIBGIT2_SYS_USE_PKG_CONFIG=1 |
| 50 |
export LIBSSH2_SYS_USE_PKG_CONFIG=1 |
| 51 |
export PKG_CONFIG_ALLOW_CROSS=1 |
Archives