diff --git a/llvm14.spec b/llvm14.spec index 9f3e114..a8ac780 100644 --- a/llvm14.spec +++ b/llvm14.spec @@ -163,7 +163,7 @@ llvm-dwarfdump \ llvm-dwp \ llvm-gsymutil -%global llvm_cxxabi_coff_macho_tools \ +%global llvm_abi_coff_macho_tools \ %dnl ABI tools \ llvm-cxxdump \ llvm-cxxfilt \ @@ -254,7 +254,7 @@ %endif %global binfiles \ %{llvm_ua_anchor} %{llvm_tools} %{llvm_elf_dwarf_tools} \ - %{llvm_cxxabi_coff_macho_tools} %{llvm_instrumentation_development_tools} \ + %{llvm_abi_coff_macho_tools} %{llvm_instrumentation_development_tools} \ %{clang_ua_anchor} %{clang_binfiles} %{clang_tools_extra_binfiles} \ %{?lld_ua_anchor} %{?lld_binfiles} %{?lldb_ua_anchor} %{?lldb_binfiles} @@ -273,15 +273,7 @@ llvm-cov \ llvm-profdata \ llvm-profgen \ - llvm-symbolizer \ -%dnl Development utilities \ - bugpoint \ - llvm-diff \ - llvm-mca \ - llvm-stress \ - llvm-strings \ - llvm-tblgen \ - llvm-tli-checker + llvm-symbolizer %global llvm_aux_man \ %dnl ELF tools \ llvm-ar \ @@ -297,9 +289,6 @@ dsymutil \ llvm-addr2line \ llvm-dwarfdump \ -%dnl ABI tools \ - llvm-cxxfilt \ - llvm-cxxmap \ %dnl Windows/COFF \ llvm-lib \ llvm-pdbutil \ @@ -308,9 +297,21 @@ llvm-libtool-darwin \ llvm-lipo \ llvm-otool +%global llvm_util_man \ +%dnl ABI tools \ + llvm-cxxfilt \ + llvm-cxxmap \ +%dnl Development utilities \ + bugpoint \ + llvm-diff \ + llvm-mca \ + llvm-stress \ + llvm-strings \ + llvm-tblgen \ + llvm-tli-checker %global clang_manfiles clang diagtool -%global manfiles %{llvm_main_man} %{llvm_aux_man} %{clang_manfiles} +%global manfiles %{llvm_main_man} %{llvm_aux_man} %{llvm_util_man} %{clang_manfiles} %define _dwz_low_mem_die_limit 40000000 %define _dwz_max_die_limit 200000000 @@ -1429,10 +1430,11 @@ fi %{ua_install %llvm_ua_anchor} \ %{lapply -p ua_bin_slave %llvm_tools} \ %{lapply -p ua_bin_slave %llvm_elf_dwarf_tools} \ - %{lapply -p ua_bin_slave %llvm_cxxabi_coff_macho_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_aux_man} \ + %{lapply -p ua_man_slave %llvm_util_man} %postun %{ua_remove %llvm_ua_anchor} @@ -1485,23 +1487,26 @@ fi %license CREDITS.TXT LICENSE.TXT %{lapply -p bin_path %llvm_ua_anchor %llvm_tools} %{lapply -p bin_path %llvm_elf_dwarf_tools} -%{lapply -p bin_path %llvm_cxxabi_coff_macho_tools} +%{lapply -p bin_path %llvm_abi_coff_macho_tools} %{lapply -p bin_path %llvm_instrumentation_development_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_cxxabi_coff_macho_tools} +%{lapply -p bin_relver_path %llvm_abi_coff_macho_tools} %{lapply -p bin_relver_path %llvm_instrumentation_development_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_cxxabi_coff_macho_tools} +%{lapply -p ghost_ua_bin_link %llvm_abi_coff_macho_tools} %{lapply -p ghost_ua_bin_link %llvm_instrumentation_development_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} %files -n clang%{_sonum} %license CREDITS.TXT LICENSE.TXT