From 64c035b70e2d3b90eb1fbc1c86684feac82060f810d4580ec718aee2a3b711bb Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 26 Aug 2022 00:27:31 +0000 Subject: [PATCH] - Replace %dnl in lists by something Leap's RPM understands. - Rename groups a bit. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=32 --- llvm14.spec | 82 +++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/llvm14.spec b/llvm14.spec index fc4d554..32dd2d2 100644 --- a/llvm14.spec +++ b/llvm14.spec @@ -121,10 +121,12 @@ # produces foo_a foo_b foo_c. %define lapply(p:) %{_lapply_rec -p %{-p*} -f %{shrink:%*}} +%define comment() %{nil} + # Due to RPMs recursion limit, we have to split the lists into portions of ≤ 20. %global llvm_ua_anchor llvm-ar %global llvm_tools \ -%dnl Optimizer, compiler, interpreter, linker \ +%{comment Optimizer, compiler, interpreter, linker} \ llc \ lli \ llvm-jitlink \ @@ -133,7 +135,7 @@ llvm-lto2 \ llvm-rtdyld \ opt \ -%dnl LLVM IR tools \ +%{comment LLVM IR tools} \ llvm-as \ llvm-bcanalyzer \ llvm-bitcode-strip \ @@ -145,7 +147,7 @@ llvm-sim \ llvm-split %global llvm_elf_dwarf_tools \ -%dnl ELF tools \ +%{comment ELF tools} \ llvm-cfi-verify \ llvm-nm \ llvm-objcopy \ @@ -155,7 +157,7 @@ llvm-readobj \ llvm-size \ llvm-strip \ -%dnl Debug info tools \ +%{comment Debug info tools} \ dsymutil \ llvm-addr2line \ llvm-debuginfod-find \ @@ -163,12 +165,12 @@ llvm-dwp \ llvm-gsymutil %global llvm_abi_coff_macho_tools \ -%dnl ABI tools \ +%{comment ABI tools} \ llvm-cxxdump \ llvm-cxxfilt \ llvm-cxxmap \ llvm-ifs \ -%dnl Windows/COFF \ +%{comment Windows/COFF} \ llvm-cvtres \ llvm-dlltool \ llvm-lib \ @@ -178,14 +180,14 @@ llvm-rc \ llvm-undname \ llvm-windres \ -%dnl Apple/Mach-O \ +%{comment Apple/Mach-O} \ llvm-install-name-tool \ llvm-libtool-darwin \ llvm-lipo \ llvm-otool \ llvm-tapi-diff -%global llvm_instrumentation_development_tools \ -%dnl Instrumentation and introspection \ +%global llvm_instr_devel_tools \ +%{comment Instrumentation and introspection} \ llvm-cov \ llvm-opt-report \ llvm-profdata \ @@ -194,7 +196,7 @@ llvm-xray \ sancov \ sanstats \ -%dnl Development utilities \ +%{comment Development utilities} \ bugpoint \ llvm-c-test \ llvm-mc \ @@ -254,28 +256,28 @@ %endif %global binfiles \ %{llvm_ua_anchor} %{llvm_tools} %{llvm_elf_dwarf_tools} \ - %{llvm_abi_coff_macho_tools} %{llvm_instrumentation_development_tools} \ + %{llvm_abi_coff_macho_tools} %{llvm_instr_devel_tools} \ %{clang_ua_anchor} %{clang_binfiles} %{clang_tools_extra_binfiles} \ %{?lld_ua_anchor} %{?lld_binfiles} %{?lldb_ua_anchor} %{?lldb_binfiles} -%global llvm_main_man \ -%dnl Optimizer, compiler, interpreter, linker \ +%global llvm_man \ +%{comment Optimizer, compiler, interpreter, linker} \ llc \ lli \ llvm-link \ opt \ -%dnl LLVM IR tools \ +%{comment LLVM IR tools} \ llvm-as \ llvm-bcanalyzer \ llvm-dis \ llvm-extract \ -%dnl Instrumentation and introspection \ +%{comment Instrumentation and introspection} \ llvm-cov \ llvm-profdata \ llvm-profgen \ llvm-symbolizer -%global llvm_aux_man \ -%dnl ELF tools \ +%global llvm_bin_utils_man \ +%{comment ELF tools} \ llvm-ar \ llvm-nm \ llvm-objcopy \ @@ -285,23 +287,23 @@ llvm-readobj \ llvm-size \ llvm-strip \ -%dnl Debug info tools \ +%{comment Debug info tools} \ dsymutil \ llvm-addr2line \ llvm-dwarfdump \ -%dnl Windows/COFF \ +%{comment Windows/COFF} \ llvm-lib \ llvm-pdbutil \ -%dnl Apple/Mach-O \ +%{comment Apple/Mach-O} \ llvm-install-name-tool \ llvm-libtool-darwin \ llvm-lipo \ llvm-otool -%global llvm_util_man \ -%dnl ABI tools \ +%global llvm_devel_utils_man \ +%{comment ABI tools} \ llvm-cxxfilt \ llvm-cxxmap \ -%dnl Development utilities \ +%{comment Development utilities} \ bugpoint \ llvm-diff \ llvm-mca \ @@ -311,7 +313,7 @@ llvm-tli-checker %global clang_manfiles clang diagtool -%global manfiles %{llvm_main_man} %{llvm_aux_man} %{llvm_util_man} %{clang_manfiles} +%global manfiles %{llvm_man} %{llvm_bin_utils_man} %{llvm_devel_utils_man} %{clang_manfiles} %define _dwz_low_mem_die_limit 40000000 %define _dwz_max_die_limit 200000000 @@ -1431,10 +1433,10 @@ fi %{lapply -p ua_bin_slave %llvm_tools} \ %{lapply -p ua_bin_slave %llvm_elf_dwarf_tools} \ %{lapply -p ua_bin_slave %llvm_abi_coff_macho_tools} \ - %{lapply -p ua_bin_slave %llvm_instrumentation_development_tools} \ - %{lapply -p ua_man_slave %llvm_main_man} \ - %{lapply -p ua_man_slave %llvm_aux_man} \ - %{lapply -p ua_man_slave %llvm_util_man} + %{lapply -p ua_bin_slave %llvm_instr_devel_tools} \ + %{lapply -p ua_man_slave %llvm_man} \ + %{lapply -p ua_man_slave %llvm_bin_utils_man} \ + %{lapply -p ua_man_slave %llvm_devel_utils_man} %postun %{ua_remove %llvm_ua_anchor} @@ -1488,25 +1490,25 @@ fi %{lapply -p bin_path %llvm_ua_anchor %llvm_tools} %{lapply -p bin_path %llvm_elf_dwarf_tools} %{lapply -p bin_path %llvm_abi_coff_macho_tools} -%{lapply -p bin_path %llvm_instrumentation_development_tools} +%{lapply -p bin_path %llvm_instr_devel_tools} %{lapply -p bin_relver_path %llvm_ua_anchor %llvm_tools} %{lapply -p bin_relver_path %llvm_elf_dwarf_tools} %{lapply -p bin_relver_path %llvm_abi_coff_macho_tools} -%{lapply -p bin_relver_path %llvm_instrumentation_development_tools} +%{lapply -p bin_relver_path %llvm_instr_devel_tools} %{lapply -p ghost_ua_bin_link %llvm_ua_anchor %llvm_tools} %{lapply -p ghost_ua_bin_link %llvm_elf_dwarf_tools} %{lapply -p ghost_ua_bin_link %llvm_abi_coff_macho_tools} -%{lapply -p ghost_ua_bin_link %llvm_instrumentation_development_tools} +%{lapply -p ghost_ua_bin_link %llvm_instr_devel_tools} -%{lapply -p man_path %llvm_main_man} -%{lapply -p man_path %llvm_aux_man} -%{lapply -p man_path %llvm_util_man} -%{lapply -p man_relver_path %llvm_main_man} -%{lapply -p man_relver_path %llvm_aux_man} -%{lapply -p man_relver_path %llvm_util_man} -%{lapply -p ghost_ua_man_link %llvm_main_man} -%{lapply -p ghost_ua_man_link %llvm_aux_man} -%{lapply -p ghost_ua_man_link %llvm_util_man} +%{lapply -p man_path %llvm_man} +%{lapply -p man_path %llvm_bin_utils_man} +%{lapply -p man_path %llvm_devel_utils_man} +%{lapply -p man_relver_path %llvm_man} +%{lapply -p man_relver_path %llvm_bin_utils_man} +%{lapply -p man_relver_path %llvm_devel_utils_man} +%{lapply -p ghost_ua_man_link %llvm_man} +%{lapply -p ghost_ua_man_link %llvm_bin_utils_man} +%{lapply -p ghost_ua_man_link %llvm_devel_utils_man} %files -n clang%{_sonum} %license CREDITS.TXT LICENSE.TXT