From 3a03c62ad6078351fa141aa5f5043a991666c4bc48c4d392daf8aeaa4f63cd92 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 23 Oct 2019 19:17:39 +0000 Subject: [PATCH] Accepting request 742099 from home:rhafer:branches:devel:languages:rust - Switch to bundled version of libgit2 for now. libgit2-sys seems to expect using the bundled variant, which just seems to point to a snapshot of the master branch and doesn't match any released libgit2 (bsc#1154817). See: https://github.com/rust-lang/rust/issues/63476 and https://github.com/rust-lang/git2-rs/issues/458 for details. OBS-URL: https://build.opensuse.org/request/show/742099 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=231 --- rust.changes | 10 ++++++++++ rust.spec | 8 ++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rust.changes b/rust.changes index 51c68f9..fb9bea4 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 23 09:56:33 UTC 2019 - Ralf Haferkamp + +- Switch to bundled version of libgit2 for now. libgit2-sys seems + to expect using the bundled variant, which just seems to point + to a snapshot of the master branch and doesn't match any released + libgit2 (bsc#1154817). + See: https://github.com/rust-lang/rust/issues/63476 and + https://github.com/rust-lang/git2-rs/issues/458 for details. + ------------------------------------------------------------------- Mon Sep 30 21:29:54 UTC 2019 - Luke Jones diff --git a/rust.spec b/rust.spec index a250101..2e8c746 100644 --- a/rust.spec +++ b/rust.spec @@ -150,10 +150,8 @@ BuildRequires: procps BuildRequires: python3-base BuildRequires: pkgconfig(libcurl) # The following requires must mirror: -# LIBGIT2_SYS_USE_PKG_CONFIG && # LIBSSH2_SYS_USE_PKG_CONFIG %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 -BuildRequires: pkgconfig(libgit2) >= 0.23 BuildRequires: pkgconfig(libssh2) >= 1.4.3 %endif BuildRequires: pkgconfig(openssl) @@ -460,9 +458,8 @@ export CC=gcc-7 export CXX=g++-7 %endif # Cargo use system libs if not bootstrapping -# restircted only to libgit due to version changes causing with cargo rpm deps +# restircted only to libssh due to version changes causing with cargo rpm deps %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 -export LIBGIT2_SYS_USE_PKG_CONFIG=1 export LIBSSH2_SYS_USE_PKG_CONFIG=1 %endif # eliminate complain from RPMlint @@ -486,9 +483,8 @@ export CC=gcc-7 export CXX=g++-7 %endif # Cargo use system libs if not bootstrapping -# restircted only to libgit due to version changes causing with cargo rpm deps +# restircted only to libssh due to version changes causing with cargo rpm deps %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 -export LIBGIT2_SYS_USE_PKG_CONFIG=1 export LIBSSH2_SYS_USE_PKG_CONFIG=1 %endif # eliminate complain from RPMlint