From 448655ca5cc74766151af5672f48e3808aaf1e6346a4d0d7de2970a17137975b Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 13 Feb 2019 10:18:05 +0000 Subject: [PATCH] Accepting request 674183 from home:glaubitz:branches:devel:tools:compiler - Remove ppc from Exclude field in spec file - Allow use of Gold linker to be conditional - Disable Gold linker on ppc OBS-URL: https://build.opensuse.org/request/show/674183 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=519 --- llvm.changes | 7 +++++++ llvm.spec | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/llvm.changes b/llvm.changes index 02ba700..dc4fb3d 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 12 16:33:33 UTC 2019 - John Paul Adrian Glaubitz + +- Remove ppc from Exclude field in spec file +- Allow use of Gold linker to be conditional +- Disable Gold linker on ppc + ------------------------------------------------------------------- Mon Jan 14 15:39:53 UTC 2019 - msrb@suse.com diff --git a/llvm.spec b/llvm.spec index 2255cb8..cd9acae 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,10 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%ifarch ppc +%bcond_with gold +%else +%bcond_without gold +%endif + %define _sonum 7 %ifarch x86_64 %define has_lldb 1 @@ -42,7 +48,9 @@ BuildRequires: llvm%{_sonum} = %{version} BuildRequires: llvm%{_sonum}-LTO-devel = %{version} BuildRequires: llvm%{_sonum}-devel = %{version} BuildRequires: llvm%{_sonum}-emacs-plugins = %{version} +%if %{with gold} BuildRequires: llvm%{_sonum}-gold = %{version} +%endif BuildRequires: llvm%{_sonum}-vim-plugins = %{version} Requires: llvm%{_sonum} = %{version} %if 0%{?has_lldb} @@ -53,7 +61,7 @@ BuildRequires: lldb%{_sonum}-devel = %{version} BuildRequires: python3-lldb%{_sonum} = %{version} %endif # Mirrors ExcludeArch in llvm%{_sonum} -ExcludeArch: ppc s390 +ExcludeArch: s390 %description LLVM is a compiler infrastructure designed for compile-time, @@ -71,7 +79,9 @@ don't require a specific LLVM version should depend on this. Summary: Header Files for LLVM Group: Development/Languages/Other Requires: llvm%{_sonum}-devel = %{version} +%if %{with gold} Requires: llvm-gold +%endif %description devel This package contains library and header files needed to develop @@ -140,6 +150,7 @@ This package is a dummy package that depends on the version of llvm-LTO-devel that openSUSE currently supports. Packages that don't require a specific LLVM version should depend on this. +%if %{with gold} %package gold Summary: Gold linker plugin for LLVM Group: Development/Languages/Other @@ -151,6 +162,7 @@ This package contains the Gold linker plugin for LLVM. This package is a dummy package that depends on the version of llvm-gold that openSUSE currently supports. Packages that don't require a specific LLVM version should depend on this. +%endif %package vim-plugins Summary: Vim plugins for LLVM @@ -245,8 +257,10 @@ echo "This is a dummy package to provide a dependency on the system compiler." > %files -n clang-checker %doc README +%if %{with gold} %files gold %doc README +%endif %files devel %doc README