From 7f0bc74e16409bb4d76f7fd7b89fa19580f8bb9a2f668e3d36a063e6239b6603 Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Wed, 27 Feb 2019 01:11:08 +0000
Subject: [PATCH] Accepting request 679667 from
 home:luke_nukem:branches:devel:languages:rust

Fix libgit requirement during bootstrap.
Revert back to system LLVM (removes bcond)

OBS-URL: https://build.opensuse.org/request/show/679667
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=189
---
 rust.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rust.spec b/rust.spec
index d0f9d40..f99d76c 100644
--- a/rust.spec
+++ b/rust.spec
@@ -72,10 +72,6 @@
 %bcond_without bundled_llvm
 %endif
 
-# System LLVM currently causes issues for rust when building FireFox
-# so we will use the bundled LLVM for all builds anyway
-%bcond_without bundled_llvm
-
 # Debuginfo can exhaust memory on these architecture workers
 %ifarch  %{arm} %{ix86}
 %define codegen_units --set rust.codegen-units=4
@@ -89,15 +85,16 @@
 # eliminate complain from RPMlint
 %global nocomplain CPPFLAGS="%{optflags}"
 # Cargo use system libs if not bootstrapping
+# restircted only to libgit due to version changes causing with cargo rpm deps
+%global cargo_ssh LIBSSH2_SYS_USE_PKG_CONFIG=1
 %if !%with rust_bootstrap
 %global cargo_git LIBGIT2_SYS_USE_PKG_CONFIG=1
-%global cargo_ssh LIBSSH2_SYS_USE_PKG_CONFIG=1
 # Must be exported before running x.py in both build and install
 # If the environments between build and install and different,
 # everything will be rebuilt during installation!
 %global build_env_vars RUSTFLAGS="%{rustflags}" %{cargo_git} %{cargo_ssh} %{nocomplain}
 %else
-%global build_env_vars RUSTFLAGS="%{rustflags}" %{nocomplain}
+%global build_env_vars RUSTFLAGS="%{rustflags}" %{cargo_ssh} %{nocomplain}
 %endif
 
 # enable the --with-rust_bootstrap flag
@@ -131,7 +128,9 @@ BuildRequires:  pkgconfig
 BuildRequires:  procps
 BuildRequires:  python3-base
 BuildRequires:  pkgconfig(libcurl)
+%if !%with rust_bootstrap
 BuildRequires:  pkgconfig(libgit2) >= 0.23
+%endif
 BuildRequires:  pkgconfig(libssh2) >= 1.4.3
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)