From 9245da2d8afb9f4be37b7d56104e6b1d0a7d4c40 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 20 Mar 2017 12:09:48 -0700 Subject: [PATCH] Make rust-lldb arch-specific to deal with lldb deps --- rust.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/rust.spec b/rust.spec index 1d23353..85fa005 100644 --- a/rust.spec +++ b/rust.spec @@ -32,18 +32,23 @@ %bcond_with bundled_llvm %endif +# LLDB only works on some architectures +%ifarch %{arm} aarch64 %{ix86} x86_64 # LLDB isn't available everywhere... -%if 0%{?rhel} -%bcond_with lldb -%else +%if !0%{?rhel} %bcond_without lldb +%else +%bcond_with lldb +%endif +%else +%bcond_with lldb %endif Name: rust Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and ISC and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -207,10 +212,10 @@ programs. %package lldb Summary: LLDB pretty printers for Rust -BuildArch: noarch -# LLDB is only available on some architectures -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 +# It could be noarch, but lldb has limited availability +#BuildArch: noarch + Requires: lldb Requires: python-lldb @@ -413,6 +418,9 @@ make check || : %changelog +* Mon Mar 20 2017 Josh Stone - 1.16.0-3 +- Make rust-lldb arch-specific to deal with lldb deps + * Fri Mar 17 2017 Josh Stone - 1.16.0-2 - Limit rust-lldb arches