llvm18: remove _x86 suffix from binaries

haikuports · Mar 26, 2024 · f69c6db · f69c6db
1 parent 07570fe
commit f69c6db
Showing 1 changed file with 128 additions and 125 deletions.
diff --git a/sys-devel/llvm/llvm18-18.1.2.recipe b/sys-devel/llvm/llvm18-18.1.2.recipe
@@ -43,84 +43,82 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
 	llvm18$secondaryArchSuffix = $portVersionCompat
-	cmd:bugpoint$secondaryArchSuffix
-	cmd:dsymutil$secondaryArchSuffix
-	cmd:llc$secondaryArchSuffix
-	cmd:lli$secondaryArchSuffix
-	cmd:llvm_addr2line$secondaryArchSuffix
-	cmd:llvm_ar$secondaryArchSuffix
-	cmd:llvm_as$secondaryArchSuffix
-	cmd:llvm_bcanalyzer$secondaryArchSuffix
-	cmd:llvm_bitcode_strip$secondaryArchSuffix
-	cmd:llvm_c_test$secondaryArchSuffix
-	cmd:llvm_cat$secondaryArchSuffix
-	cmd:llvm_cfi_verify$secondaryArchSuffix
-	cmd:llvm_config$secondaryArchSuffix = $portVersionCompat
-	cmd:llvm_cov$secondaryArchSuffix
-	cmd:llvm_cvtres$secondaryArchSuffix
-	cmd:llvm_cxxdump$secondaryArchSuffix
-	cmd:llvm_cxxfilt$secondaryArchSuffix
-	cmd:llvm_cxxmap$secondaryArchSuffix
-	cmd:llvm_debuginfo_analyzer$secondaryArchSuffix
-	cmd:llvm_debuginfod$secondaryArchSuffix
-	cmd:llvm_debuginfod_find$secondaryArchSuffix
-	cmd:llvm_diff$secondaryArchSuffix
-	cmd:llvm_dis$secondaryArchSuffix
-	cmd:llvm_dlltool$secondaryArchSuffix
-	cmd:llvm_dwarfdump$secondaryArchSuffix
-	cmd:llvm_dwarfutil$secondaryArchSuffix
-	cmd:llvm_dwp$secondaryArchSuffix
-	cmd:llvm_exegesis$secondaryArchSuffix
-	cmd:llvm_extract$secondaryArchSuffix
-	cmd:llvm_gsymutil$secondaryArchSuffix
-	cmd:llvm_ifs$secondaryArchSuffix
-	cmd:llvm_install_name_tool$secondaryArchSuffix
-	cmd:llvm_jitlink$secondaryArchSuffix
-	cmd:llvm_lib$secondaryArchSuffix
-	cmd:llvm_libtool_darwin$secondaryArchSuffix
-	cmd:llvm_link$secondaryArchSuffix
-	cmd:llvm_lipo$secondaryArchSuffix
-	cmd:llvm_lto$secondaryArchSuffix
-	cmd:llvm_lto2$secondaryArchSuffix
-	cmd:llvm_mc$secondaryArchSuffix
-	cmd:llvm_mca$secondaryArchSuffix
-	cmd:llvm_ml$secondaryArchSuffix
-	cmd:llvm_modextract$secondaryArchSuffix
-	cmd:llvm_mt$secondaryArchSuffix
-	cmd:llvm_nm$secondaryArchSuffix
-	cmd:llvm_objcopy$secondaryArchSuffix
-	cmd:llvm_objdump$secondaryArchSuffix
-	cmd:llvm_opt_report$secondaryArchSuffix
-	cmd:llvm_otool$secondaryArchSuffix
-	cmd:llvm_pdbutil$secondaryArchSuffix
-	cmd:llvm_profdata$secondaryArchSuffix
-	cmd:llvm_profgen$secondaryArchSuffix
-	cmd:llvm_ranlib$secondaryArchSuffix
-	cmd:llvm_rc$secondaryArchSuffix
-	cmd:llvm_readelf$secondaryArchSuffix
-	cmd:llvm_readtapi$secondaryArchSuffix
-	cmd:llvm_readobj$secondaryArchSuffix
-	cmd:llvm_reduce$secondaryArchSuffix
-	cmd:llvm_remark_size_diff$secondaryArchSuffix
-	cmd:llvm_remarkutil$secondaryArchSuffix
-	cmd:llvm_rtdyld$secondaryArchSuffix
-	cmd:llvm_sim$secondaryArchSuffix
-	cmd:llvm_size$secondaryArchSuffix
-	cmd:llvm_split$secondaryArchSuffix
-	cmd:llvm_stress$secondaryArchSuffix
-	cmd:llvm_strings$secondaryArchSuffix
-	cmd:llvm_strip$secondaryArchSuffix
-	cmd:llvm_symbolizer$secondaryArchSuffix
-	cmd:llvm_tapi_diff$secondaryArchSuffix
-	cmd:llvm_tblgen$secondaryArchSuffix
-	cmd:llvm_tli_checker$secondaryArchSuffix
-	cmd:llvm_undname$secondaryArchSuffix
-	cmd:llvm_windres$secondaryArchSuffix
-	cmd:llvm_xray$secondaryArchSuffix
-	cmd:opt$secondaryArchSuffix
-	cmd:sancov$secondaryArchSuffix
-	cmd:sanstats$secondaryArchSuffix
-	cmd:verify_uselistorder$secondaryArchSuffix
+	cmd:bugpoint
+	cmd:dsymutil
+	cmd:llc
+	cmd:lli
+	cmd:llvm_addr2line
+	cmd:llvm_ar
+	cmd:llvm_as
+	cmd:llvm_bcanalyzer
+	cmd:llvm_bitcode_strip
+	cmd:llvm_c_test
+	cmd:llvm_cat
+	cmd:llvm_cfi_verify
+	cmd:llvm_config = $portVersionCompat
+	cmd:llvm_cov
+	cmd:llvm_cvtres
+	cmd:llvm_cxxdump
+	cmd:llvm_cxxfilt
+	cmd:llvm_cxxmap
+	cmd:llvm_debuginfo_analyzer
+	cmd:llvm_debuginfod
+	cmd:llvm_debuginfod_find
+	cmd:llvm_diff
+	cmd:llvm_dis
+	cmd:llvm_dlltool
+	cmd:llvm_dwarfdump
+	cmd:llvm_dwarfutil
+	cmd:llvm_dwp
+	cmd:llvm_exegesis
+	cmd:llvm_extract
+	cmd:llvm_gsymutil
+	cmd:llvm_ifs
+	cmd:llvm_install_name_tool
+	cmd:llvm_jitlink
+	cmd:llvm_lib
+	cmd:llvm_libtool_darwin
+	cmd:llvm_link
+	cmd:llvm_lipo
+	cmd:llvm_lto
+	cmd:llvm_lto2
+	cmd:llvm_mc
+	cmd:llvm_mca
+	cmd:llvm_ml
+	cmd:llvm_modextract
+	cmd:llvm_mt
+	cmd:llvm_nm
+	cmd:llvm_objcopy
+	cmd:llvm_objdump
+	cmd:llvm_opt_report
+	cmd:llvm_otool
+	cmd:llvm_pdbutil
+	cmd:llvm_profdata
+	cmd:llvm_profgen
+	cmd:llvm_ranlib
+	cmd:llvm_rc
+	cmd:llvm_readelf
+	cmd:llvm_readobj
+	cmd:llvm_readtapi
+	cmd:llvm_reduce
+	cmd:llvm_remarkutil
+	cmd:llvm_rtdyld
+	cmd:llvm_sim
+	cmd:llvm_size
+	cmd:llvm_split
+	cmd:llvm_stress
+	cmd:llvm_strings
+	cmd:llvm_strip
+	cmd:llvm_symbolizer
+	cmd:llvm_tblgen
+	cmd:llvm_tli_checker
+	cmd:llvm_undname
+	cmd:llvm_windres
+	cmd:llvm_xray
+	cmd:opt
+	cmd:sancov
+	cmd:sanstats
+	cmd:verify_uselistorder
 	devel:libfindAllSymbols$secondaryArchSuffix
 	devel:libLLVM$secondaryArchSuffix = $portVersionCompat
 	devel:libLLVM_$portVersion$secondaryArchSuffix = $portVersionCompat
@@ -272,43 +270,43 @@ CONFLICTS="
 
 PROVIDES_clang="
 	llvm18${secondaryArchSuffix}_clang = $portVersion
-	cmd:amdgpu_arch$secondaryArchSuffix = $portVersion
-	cmd:c_index_test$secondaryArchSuffix = $portVersion
-	cmd:clang$secondaryArchSuffix = $portVersion
-	cmd:clang++$secondaryArchSuffix = $portVersion
-	cmd:clang_18$secondaryArchSuffix = $portVersion
-	cmd:clang_apply_replacements$secondaryArchSuffix = $portVersion
-	cmd:clang_change_namespace$secondaryArchSuffix = $portVersion
-	cmd:clang_check$secondaryArchSuffix = $portVersion
-	cmd:clang_cl$secondaryArchSuffix = $portVersion
-	cmd:clang_cpp$secondaryArchSuffix = $portVersion
-	cmd:clang_doc$secondaryArchSuffix = $portVersion
-	cmd:clang_extdef_mapping$secondaryArchSuffix = $portVersion
-	cmd:clang_format$secondaryArchSuffix = $portVersion
-	cmd:clang_include_cleaner$secondaryArchSuffix = $portVersion
-	cmd:clang_include_fixer$secondaryArchSuffix = $portVersion
-	cmd:clang_linker_wrapper$secondaryArchSuffix = $portVersion
-	cmd:clang_move$secondaryArchSuffix = $portVersion
-	cmd:clang_offload_bundler$secondaryArchSuffix = $portVersion
-	cmd:clang_offload_packager$secondaryArchSuffix = $portVersion
-	cmd:clang_pseudo$secondaryArchSuffix = $portVersion
-	cmd:clang_query$secondaryArchSuffix = $portVersion
-	cmd:clang_refactor$secondaryArchSuffix = $portVersion
-	cmd:clang_rename$secondaryArchSuffix = $portVersion
-	cmd:clang_reorder_fields$secondaryArchSuffix = $portVersion
-	cmd:clang_repl$secondaryArchSuffix = $portVersion
-	cmd:clang_scan_deps$secondaryArchSuffix = $portVersion
-	cmd:clang_tidy$secondaryArchSuffix = $portVersion
-	cmd:clang_tblgen$secondaryArchSuffix = $portVersion
-	cmd:clangd$secondaryArchSuffix = $portVersion
-	cmd:diagtool$secondaryArchSuffix = $portVersion
-	cmd:find_all_symbols$secondaryArchSuffix = $portVersion
-	cmd:git_clang_format$secondaryArchSuffix = $portVersion
-	cmd:hmaptool$secondaryArchSuffix = $portVersion
-	cmd:modularize$secondaryArchSuffix = $portVersion
-	cmd:nvptx_arch$secondaryArchSuffix = $portVersion
-	cmd:pp_trace$secondaryArchSuffix = $portVersion
-	cmd:run_clang_tidy$secondaryArchSuffix = $portVersion
+	cmd:amdgpu_arch = $portVersion
+	cmd:c_index_test = $portVersion
+	cmd:clang = $portVersion
+	cmd:clang++ = $portVersion
+	cmd:clang_18 = $portVersion
+	cmd:clang_apply_replacements = $portVersion
+	cmd:clang_change_namespace = $portVersion
+	cmd:clang_check = $portVersion
+	cmd:clang_cl = $portVersion
+	cmd:clang_cpp = $portVersion
+	cmd:clang_doc = $portVersion
+	cmd:clang_extdef_mapping = $portVersion
+	cmd:clang_format = $portVersion
+	cmd:clang_include_cleaner = $portVersion
+	cmd:clang_include_fixer = $portVersion
+	cmd:clang_linker_wrapper = $portVersion
+	cmd:clang_move = $portVersion
+	cmd:clang_offload_bundler = $portVersion
+	cmd:clang_offload_packager = $portVersion
+	cmd:clang_pseudo = $portVersion
+	cmd:clang_query = $portVersion
+	cmd:clang_refactor = $portVersion
+	cmd:clang_rename = $portVersion
+	cmd:clang_reorder_fields = $portVersion
+	cmd:clang_repl = $portVersion
+	cmd:clang_scan_deps = $portVersion
+	cmd:clang_tblgen = $portVersion
+	cmd:clang_tidy = $portVersion
+	cmd:clangd = $portVersion
+	cmd:diagtool = $portVersion
+	cmd:find_all_symbols = $portVersion
+	cmd:git_clang_format = $portVersion
+	cmd:hmaptool = $portVersion
+	cmd:modularize = $portVersion
+	cmd:nvptx_arch = $portVersion
+	cmd:pp_trace = $portVersion
+	cmd:run_clang_tidy = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersionCompat
 	devel:libclang_cpp$secondaryArchSuffix = $portVersionCompat
 	devel:libclanganalysis$secondaryArchSuffix = $portVersion
@@ -417,11 +415,11 @@ CONFLICTS_clang="
 
 PROVIDES_clang_analysis="
 	llvm18${secondaryArchSuffix}_clang_analysis = $portVersion
-	cmd:analyze_build$secondaryArchSuffix = $portVersion
-	cmd:intercept_build$secondaryArchSuffix = $portVersion
-	cmd:scan_build$secondaryArchSuffix = $portVersion
-	cmd:scan_build_py$secondaryArchSuffix = $portVersion
-	cmd:scan_view$secondaryArchSuffix = $portVersion
+	cmd:analyze_build = $portVersion
+	cmd:intercept_build = $portVersion
+	cmd:scan_build = $portVersion
+	cmd:scan_build_py = $portVersion
+	cmd:scan_view = $portVersion
 	"
 REQUIRES_clang_analysis="
 	llvm18${secondaryArchSuffix}_clang == $portVersion base
@@ -436,11 +434,11 @@ CONFLICTS_clang_analysis="
 
 PROVIDES_lld="
 	llvm18${secondaryArchSuffix}_lld = $portVersion
-	cmd:ld.lld$secondaryArchSuffix = $portVersion
-	cmd:ld64.lld$secondaryArchSuffix = $portVersion
-	cmd:lld$secondaryArchSuffix = $portVersion
-	cmd:lld_link$secondaryArchSuffix = $portVersion
-	cmd:wasm_ld$secondaryArchSuffix = $portVersion
+	cmd:ld.lld = $portVersion
+	cmd:ld64.lld = $portVersion
+	cmd:lld = $portVersion
+	cmd:lld_link = $portVersion
+	cmd:wasm_ld = $portVersion
 	devel:liblldCOFF$secondaryArchSuffix = $portVersion
 	devel:liblldCommon$secondaryArchSuffix = $portVersion
 	devel:liblldELF$secondaryArchSuffix = $portVersion
@@ -559,6 +557,7 @@ BUILD()
 		$cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		$cmakeFlags \
+		-DCMAKE_INSTALL_BINDIR=bin \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
 		-DLLVM_ENABLE_RTTI=ON -DLLVM_LINK_LLVM_DYLIB=YES \
@@ -572,6 +571,10 @@ BUILD()
 
 INSTALL()
 {
+	if [ -n "$secondaryArchSuffix" ]; then
+		binDir=$prefix/bin
+	fi
+
 	cmake --install build
 
 	cd build