From 1a1ed0bd7fbad74c0a4dc449c903c2f792485b4f971a2a114ddee1eece4cccf9 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Sun, 17 Mar 2024 22:47:58 +0000 Subject: [PATCH 1/2] - Drop libomp-devel and python3-lldb where the versioned package is not being built. - Let llvm-devel require libomp-devel only where it is built. - Let lldb recommend python3-lldb only where it is built. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=605 --- llvm.changes | 8 ++++++++ llvm.spec | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/llvm.changes b/llvm.changes index b4b200f..2101282 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Mar 17 22:45:02 UTC 2024 - Aaron Puchert + +- Drop libomp-devel and python3-lldb where the versioned package is + not being built. +- Let llvm-devel require libomp-devel only where it is built. +- Let lldb recommend python3-lldb only where it is built. + ------------------------------------------------------------------- Sat Mar 9 20:32:49 UTC 2024 - Aaron Puchert diff --git a/llvm.spec b/llvm.spec index 29a3430..2ef140d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -17,10 +17,17 @@ %define _sonum 18 + +%ifarch aarch64 ppc64 ppc64le %{ix86} x86_64 +%global has_openmp +%endif + %ifarch aarch64 x86_64 %define has_lldb 1 +%if %{suse_version} > 1600 %define has_lldb_python 1 %endif +%endif # obsolete_llvm_versioned() prefix postfix # Obsolete packages X or X- with X being a set of older versions. @@ -67,7 +74,9 @@ Group: Development/Libraries/C and C++ Requires: llvm%{_sonum}-devel Provides: llvm-LTO-devel = %{version} Obsoletes: llvm-LTO-devel < %{version} +%if 0%{?has_openmp} Requires: libomp-devel +%endif Requires: llvm-gold Requires: llvm-polly-devel %obsolete_llvm_versioned llvm devel @@ -193,7 +202,9 @@ Summary: Software debugger built using LLVM libraries Group: Development/Tools/Debuggers URL: https://lldb.llvm.org/ Requires: lldb%{_sonum} +%if 0%{?has_lldb_python} Recommends: python3-lldb +%endif %description -n lldb LLDB is a next generation, high-performance debugger. It is built as a set @@ -354,8 +365,10 @@ echo "This is a dummy package to provide a dependency on the system compiler." > %files -n lld %doc README +%if 0%{?has_openmp} %files -n libomp-devel %doc README +%endif %files polly %doc README From 13fb82039ce1f3711542fed11dd36d5392b420b9991c6e673b634c6450954613 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Sun, 17 Mar 2024 22:51:08 +0000 Subject: [PATCH 2/2] - Add macro body. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=606 --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 2ef140d..048ae3a 100644 --- a/llvm.spec +++ b/llvm.spec @@ -19,7 +19,7 @@ %define _sonum 18 %ifarch aarch64 ppc64 ppc64le %{ix86} x86_64 -%global has_openmp +%global has_openmp 1 %endif %ifarch aarch64 x86_64