pool/rust
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 742247 from devel:languages:rust

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/742247
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rust?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2019-10-25 16:41:14 +00:00 committed by Git OBS Bridge
commit a6c5edafe3
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rust.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 23 09:56:33 UTC 2019 - Ralf Haferkamp <rhafer@suse.com>
- 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 <luke@ljones.dev> Mon Sep 30 21:29:54 UTC 2019 - Luke Jones <luke@ljones.dev>

8
rust.spec
View File

@ -150,10 +150,8 @@ BuildRequires: procps
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
# The following requires must mirror: # The following requires must mirror:
# LIBGIT2_SYS_USE_PKG_CONFIG &&
# LIBSSH2_SYS_USE_PKG_CONFIG # LIBSSH2_SYS_USE_PKG_CONFIG
%if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500
BuildRequires: pkgconfig(libgit2) >= 0.23
BuildRequires: pkgconfig(libssh2) >= 1.4.3 BuildRequires: pkgconfig(libssh2) >= 1.4.3
%endif %endif
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
@ -460,9 +458,8 @@ export CC=gcc-7
export CXX=g++-7 export CXX=g++-7
%endif %endif
# Cargo use system libs if not bootstrapping # 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 %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 export LIBSSH2_SYS_USE_PKG_CONFIG=1
%endif %endif
# eliminate complain from RPMlint # eliminate complain from RPMlint
@ -486,9 +483,8 @@ export CC=gcc-7
export CXX=g++-7 export CXX=g++-7
%endif %endif
# Cargo use system libs if not bootstrapping # 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 %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 export LIBSSH2_SYS_USE_PKG_CONFIG=1
%endif %endif
# eliminate complain from RPMlint # eliminate complain from RPMlint