PR#201: Fixes for big-merge - rpms/llvm

		`@@ -3,7 +3,6 @@`
		`# You need these packages to run this script: git tar xz curl-minimal`

		`set -e`
		`- set +x`

		`# This is important for systems that have a different local but want to produce`
		`# a valid changelog date.`
		`@@ -18,30 +17,14 @@`
		`llvm_snapshot_yyyymmdd=$(date +%Y%m%d)`
		`[[ ! -z "${YYYYMMDD}" ]] && llvm_snapshot_yyyymmdd=$YYYYMMDD`

		`- loginfo "Get the source tarball"`
		`- tarball_url=https://github.com/fedora-llvm-team/llvm-snapshots/releases/download/source-snapshot/llvm-project-${llvm_snapshot_yyyymmdd}.src.tar.xz`
		`- tarball=llvm-project-${llvm_snapshot_yyyymmdd}.src.tar.xz`
		`- if [ -e $tarball ]; then`
		`- loginfo "Source tarball already exists: $tarball"`
		`- else`
		`- loginfo "Downloading source tarball $tarball from $tarball_url"`
		`- curl -sL -o $tarball ${tarball_url}`
		`- fi`
		`-`
		`- loginfo "Grab git revision from tarball"`
		`- llvm_snapshot_git_revision=$(xzcat $tarball \| git get-tar-commit-id)`
		`+ git_revision_url=https://github.com/fedora-llvm-team/llvm-snapshots/releases/download/snapshot-version-sync/llvm-git-revision-${llvm_snapshot_yyyymmdd}.txt`
		`+ loginfo "Get the revision for today from $git_revision_url"`
		`+ llvm_snapshot_git_revision=$(curl -sL $git_revision_url)`
		`llvm_snapshot_git_revision_short=$(echo "${llvm_snapshot_git_revision:0:14}")`

		`- versionfile=llvm-project*.src/cmake/Modules/LLVMVersion.cmake`
		`- loginfo "Extract the ${versionfile} file from the source tarball"`
		`- if [ -e $versionfile ]; then`
		`- loginfo "CMakeLists.txt already exists: ${versionfile}"`
		`- else`
		`- tar -xf $tarball $versionfile`
		`- fi`
		`-`
		`- loginfo "Parse ${versionfile} for the LLVM version"`
		`- llvm_snapshot_version=$(grep -ioP 'set\(\s*LLVM_VERSION_(MAJOR\|MINOR\|PATCH)\s\K[0-9]+' ${versionfile} \| paste -sd '.')`
		`+ release_url=https://github.com/fedora-llvm-team/llvm-snapshots/releases/download/snapshot-version-sync/llvm-release-${llvm_snapshot_yyyymmdd}.txt`
		`+ loginfo "Get the release for today from $release_url"`
		`+ llvm_snapshot_version=$(curl -sL $release_url)`
		`llvm_snapshot_version_major=$(echo $llvm_snapshot_version \| cut -f1 -d.)`
		`llvm_snapshot_version_minor=$(echo $llvm_snapshot_version \| cut -f2 -d.)`
		`llvm_snapshot_version_patch=$(echo $llvm_snapshot_version \| cut -f3 -d.)`

.gitignore

file modified

		`@@ -1,6 +1,7 @@`
		`/*.src.rpm`
		`/*.src.tar.xz`
		`/*.src.tar.xz.sig`
		`+ /*.tar.gz`
		`/cmake/`
		`/llvm-*.src/`
		`/results_llvm/`

files.spec.inc

file modified

+336 -24

		`@@ -3,11 +3,231 @@`
		`%files -n %{pkg_name_llvm}`
		`%license llvm/LICENSE.TXT`
		`%exclude %{_mandir}/man1/llvm-config*`
		`- %{_mandir}/man1/*`
		`- %{install_bindir}/*`
		`+`
		`+ %{_mandir}/man1/bugpoint.1.gz`
		`+ %{_mandir}/man1/clang-tblgen.1.gz`
		`+ %{_mandir}/man1/dsymutil.1.gz`
		`+ %{_mandir}/man1/FileCheck.1.gz`
		`+ %{_mandir}/man1/lit.1.gz`
		`+ %{_mandir}/man1/llc.1.gz`
		`+ %{_mandir}/man1/lldb-tblgen.1.gz`
		`+ %{_mandir}/man1/lli.1.gz`
		`+ %{_mandir}/man1/llvm-addr2line.1.gz`
		`+ %{_mandir}/man1/llvm-ar.1.gz`
		`+ %{_mandir}/man1/llvm-as.1.gz`
		`+ %{_mandir}/man1/llvm-bcanalyzer.1.gz`
		`+ %{_mandir}/man1/llvm-cov.1.gz`
		`+ %{_mandir}/man1/llvm-cxxfilt.1.gz`
		`+ %{_mandir}/man1/llvm-cxxmap.1.gz`
		`+ %{_mandir}/man1/llvm-debuginfo-analyzer.1.gz`
		`+ %{_mandir}/man1/llvm-diff.1.gz`
		`+ %{_mandir}/man1/llvm-dis.1.gz`
		`+ %{_mandir}/man1/llvm-dwarfdump.1.gz`
		`+ %{_mandir}/man1/llvm-dwarfutil.1.gz`
		`+ %{_mandir}/man1/llvm-exegesis.1.gz`
		`+ %{_mandir}/man1/llvm-extract.1.gz`
		`+ %{_mandir}/man1/llvm-ifs.1.gz`
		`+ %{_mandir}/man1/llvm-install-name-tool.1.gz`
		`+ %{_mandir}/man1/llvm-lib.1.gz`
		`+ %{_mandir}/man1/llvm-libtool-darwin.1.gz`
		`+ %{_mandir}/man1/llvm-link.1.gz`
		`+ %{_mandir}/man1/llvm-lipo.1.gz`
		`+ %{_mandir}/man1/llvm-locstats.1.gz`
		`+ %{_mandir}/man1/llvm-mc.1.gz`
		`+ %{_mandir}/man1/llvm-mca.1.gz`
		`+ %{_mandir}/man1/llvm-nm.1.gz`
		`+ %{_mandir}/man1/llvm-objcopy.1.gz`
		`+ %{_mandir}/man1/llvm-objdump.1.gz`
		`+ %{_mandir}/man1/llvm-opt-report.1.gz`
		`+ %{_mandir}/man1/llvm-otool.1.gz`
		`+ %{_mandir}/man1/llvm-pdbutil.1.gz`
		`+ %{_mandir}/man1/llvm-profdata.1.gz`
		`+ %{_mandir}/man1/llvm-profgen.1.gz`
		`+ %{_mandir}/man1/llvm-ranlib.1.gz`
		`+ %{_mandir}/man1/llvm-readelf.1.gz`
		`+ %{_mandir}/man1/llvm-readobj.1.gz`
		`+ %{_mandir}/man1/llvm-reduce.1.gz`
		`+ %{_mandir}/man1/llvm-remarkutil.1.gz`
		`+ %{_mandir}/man1/llvm-size.1.gz`
		`+ %{_mandir}/man1/llvm-stress.1.gz`
		`+ %{_mandir}/man1/llvm-strings.1.gz`
		`+ %{_mandir}/man1/llvm-strip.1.gz`
		`+ %{_mandir}/man1/llvm-symbolizer.1.gz`
		`+ %{_mandir}/man1/llvm-tblgen.1.gz`
		`+ %{_mandir}/man1/llvm-tli-checker.1.gz`
		`+ %{_mandir}/man1/mlir-tblgen.1.gz`
		`+ %{_mandir}/man1/opt.1.gz`
		`+ %{_mandir}/man1/tblgen.1.gz`
		`+`
		`+ %{install_bindir}/bugpoint`
		`+ %{install_bindir}/dsymutil`
		`+ %{install_bindir}/FileCheck`
		`+ %{install_bindir}/llc`
		`+ %{install_bindir}/lli`
		`+ %{install_bindir}/llvm-addr2line`
		`+ %{install_bindir}/llvm-ar`
		`+ %{install_bindir}/llvm-as`
		`+ %{install_bindir}/llvm-bcanalyzer`
		`+ %{install_bindir}/llvm-bitcode-strip`
		`+ %{install_bindir}/llvm-c-test`
		`+ %{install_bindir}/llvm-cat`
		`+ %{install_bindir}/llvm-cfi-verify`
		`+ %{install_bindir}/llvm-cov`
		`+ %{install_bindir}/llvm-cvtres`
		`+ %{install_bindir}/llvm-cxxdump`
		`+ %{install_bindir}/llvm-cxxfilt`
		`+ %{install_bindir}/llvm-cxxmap`
		`+ %{install_bindir}/llvm-debuginfo-analyzer`
		`+ %{install_bindir}/llvm-debuginfod`
		`+ %{install_bindir}/llvm-debuginfod-find`
		`+ %{install_bindir}/llvm-diff`
		`+ %{install_bindir}/llvm-dis`
		`+ %{install_bindir}/llvm-dlltool`
		`+ %{install_bindir}/llvm-dwarfdump`
		`+ %{install_bindir}/llvm-dwarfutil`
		`+ %{install_bindir}/llvm-dwp`
		`+ %{install_bindir}/llvm-exegesis`
		`+ %{install_bindir}/llvm-extract`
		`+ %{install_bindir}/llvm-gsymutil`
		`+ %{install_bindir}/llvm-ifs`
		`+ %{install_bindir}/llvm-install-name-tool`
		`+ %{install_bindir}/llvm-jitlink`
		`+ %{install_bindir}/llvm-jitlink-executor`
		`+ %{install_bindir}/llvm-lib`
		`+ %{install_bindir}/llvm-libtool-darwin`
		`+ %{install_bindir}/llvm-link`
		`+ %{install_bindir}/llvm-lipo`
		`+ %{install_bindir}/llvm-lto`
		`+ %{install_bindir}/llvm-lto2`
		`+ %{install_bindir}/llvm-mc`
		`+ %{install_bindir}/llvm-mca`
		`+ %{install_bindir}/llvm-ml`
		`+ %{install_bindir}/llvm-modextract`
		`+ %{install_bindir}/llvm-mt`
		`+ %{install_bindir}/llvm-nm`
		`+ %{install_bindir}/llvm-objcopy`
		`+ %{install_bindir}/llvm-objdump`
		`+ %{install_bindir}/llvm-opt-report`
		`+ %{install_bindir}/llvm-otool`
		`+ %{install_bindir}/llvm-pdbutil`
		`+ %{install_bindir}/llvm-PerfectShuffle`
		`+ %{install_bindir}/llvm-profdata`
		`+ %{install_bindir}/llvm-profgen`
		`+ %{install_bindir}/llvm-ranlib`
		`+ %{install_bindir}/llvm-rc`
		`+ %{install_bindir}/llvm-readelf`
		`+ %{install_bindir}/llvm-readobj`
		`+ %{install_bindir}/llvm-readtapi`
		`+ %{install_bindir}/llvm-reduce`
		`+ %{install_bindir}/llvm-remarkutil`
		`+ %{install_bindir}/llvm-rtdyld`
		`+ %{install_bindir}/llvm-sim`
		`+ %{install_bindir}/llvm-size`
		`+ %{install_bindir}/llvm-split`
		`+ %{install_bindir}/llvm-stress`
		`+ %{install_bindir}/llvm-strings`
		`+ %{install_bindir}/llvm-strip`
		`+ %{install_bindir}/llvm-symbolizer`
		`+ %{install_bindir}/llvm-tblgen`
		`+ %{install_bindir}/llvm-tli-checker`
		`+ %{install_bindir}/llvm-undname`
		`+ %{install_bindir}/llvm-windres`
		`+ %{install_bindir}/llvm-xray`
		`+ %{install_bindir}/obj2yaml`
		`+ %{install_bindir}/opt`
		`+ %{install_bindir}/sancov`
		`+ %{install_bindir}/sanstats`
		`+ %{install_bindir}/split-file`
		`+ %{install_bindir}/UnicodeNameMappingGenerator`
		`+ %{install_bindir}/verify-uselistorder`
		`+ %{install_bindir}/yaml2obj`
		`+`
		`+`
		`%if %{with compat_build}`
		`# This is for all the binaries with the version suffix.`
		`- %{_bindir}/*%{exec_suffix}`
		`+ %{_bindir}/bugpoint%{exec_suffix}`
		`+ %{_bindir}/dsymutil%{exec_suffix}`
		`+ %{_bindir}/FileCheck%{exec_suffix}`
		`+ %{_bindir}/llc%{exec_suffix}`
		`+ %{_bindir}/lli%{exec_suffix}`
		`+ %{_bindir}/llvm-addr2line%{exec_suffix}`
		`+ %{_bindir}/llvm-ar%{exec_suffix}`
		`+ %{_bindir}/llvm-as%{exec_suffix}`
		`+ %{_bindir}/llvm-bcanalyzer%{exec_suffix}`
		`+ %{_bindir}/llvm-bitcode-strip%{exec_suffix}`
		`+ %{_bindir}/llvm-c-test%{exec_suffix}`
		`+ %{_bindir}/llvm-cat%{exec_suffix}`
		`+ %{_bindir}/llvm-cfi-verify%{exec_suffix}`
		`+ %{_bindir}/llvm-cov%{exec_suffix}`
		`+ %{_bindir}/llvm-cvtres%{exec_suffix}`
		`+ %{_bindir}/llvm-cxxdump%{exec_suffix}`
		`+ %{_bindir}/llvm-cxxfilt%{exec_suffix}`
		`+ %{_bindir}/llvm-cxxmap%{exec_suffix}`
		`+ %{_bindir}/llvm-debuginfo-analyzer%{exec_suffix}`
		`+ %{_bindir}/llvm-debuginfod%{exec_suffix}`
		`+ %{_bindir}/llvm-debuginfod-find%{exec_suffix}`
		`+ %{_bindir}/llvm-diff%{exec_suffix}`
		`+ %{_bindir}/llvm-dis%{exec_suffix}`
		`+ %{_bindir}/llvm-dlltool%{exec_suffix}`
		`+ %{_bindir}/llvm-dwarfdump%{exec_suffix}`
		`+ %{_bindir}/llvm-dwarfutil%{exec_suffix}`
		`+ %{_bindir}/llvm-dwp%{exec_suffix}`
		`+ %{_bindir}/llvm-exegesis%{exec_suffix}`
		`+ %{_bindir}/llvm-extract%{exec_suffix}`
		`+ %{_bindir}/llvm-gsymutil%{exec_suffix}`
		`+ %{_bindir}/llvm-ifs%{exec_suffix}`
		`+ %{_bindir}/llvm-install-name-tool%{exec_suffix}`
		`+ %{_bindir}/llvm-jitlink%{exec_suffix}`
		`+ %{_bindir}/llvm-jitlink-executor%{exec_suffix}`
		`+ %{_bindir}/llvm-lib%{exec_suffix}`
		`+ %{_bindir}/llvm-libtool-darwin%{exec_suffix}`
		`+ %{_bindir}/llvm-link%{exec_suffix}`
		`+ %{_bindir}/llvm-lipo%{exec_suffix}`
		`+ %{_bindir}/llvm-lto%{exec_suffix}`
		`+ %{_bindir}/llvm-lto2%{exec_suffix}`
		`+ %{_bindir}/llvm-mc%{exec_suffix}`
		`+ %{_bindir}/llvm-mca%{exec_suffix}`
		`+ %{_bindir}/llvm-ml%{exec_suffix}`
		`+ %{_bindir}/llvm-modextract%{exec_suffix}`
		`+ %{_bindir}/llvm-mt%{exec_suffix}`
		`+ %{_bindir}/llvm-nm%{exec_suffix}`
		`+ %{_bindir}/llvm-objcopy%{exec_suffix}`
		`+ %{_bindir}/llvm-objdump%{exec_suffix}`
		`+ %{_bindir}/llvm-opt-report%{exec_suffix}`
		`+ %{_bindir}/llvm-otool%{exec_suffix}`
		`+ %{_bindir}/llvm-pdbutil%{exec_suffix}`
		`+ %{_bindir}/llvm-PerfectShuffle%{exec_suffix}`
		`+ %{_bindir}/llvm-profdata%{exec_suffix}`
		`+ %{_bindir}/llvm-profgen%{exec_suffix}`
		`+ %{_bindir}/llvm-ranlib%{exec_suffix}`
		`+ %{_bindir}/llvm-rc%{exec_suffix}`
		`+ %{_bindir}/llvm-readelf%{exec_suffix}`
		`+ %{_bindir}/llvm-readobj%{exec_suffix}`
		`+ %{_bindir}/llvm-readtapi%{exec_suffix}`
		`+ %{_bindir}/llvm-reduce%{exec_suffix}`
		`+ %{_bindir}/llvm-remarkutil%{exec_suffix}`
		`+ %{_bindir}/llvm-rtdyld%{exec_suffix}`
		`+ %{_bindir}/llvm-sim%{exec_suffix}`
		`+ %{_bindir}/llvm-size%{exec_suffix}`
		`+ %{_bindir}/llvm-split%{exec_suffix}`
		`+ %{_bindir}/llvm-stress%{exec_suffix}`
		`+ %{_bindir}/llvm-strings%{exec_suffix}`
		`+ %{_bindir}/llvm-strip%{exec_suffix}`
		`+ %{_bindir}/llvm-symbolizer%{exec_suffix}`
		`+ %{_bindir}/llvm-tblgen%{exec_suffix}`
		`+ %{_bindir}/llvm-tli-checker%{exec_suffix}`
		`+ %{_bindir}/llvm-undname%{exec_suffix}`
		`+ %{_bindir}/llvm-windres%{exec_suffix}`
		`+ %{_bindir}/llvm-xray%{exec_suffix}`
		`+ %{_bindir}/obj2yaml%{exec_suffix}`
		`+ %{_bindir}/opt%{exec_suffix}`
		`+ %{_bindir}/sancov%{exec_suffix}`
		`+ %{_bindir}/sanstats%{exec_suffix}`
		`+ %{_bindir}/split-file%{exec_suffix}`
		`+ %{_bindir}/UnicodeNameMappingGenerator%{exec_suffix}`
		`+ %{_bindir}/verify-uselistorder%{exec_suffix}`
		`+ %{_bindir}/yaml2obj%{exec_suffix}`
		`+`
		`%endif`

		`%exclude %{_bindir}/llvm-config%{exec_suffix}`
		`@@ -99,7 +319,8 @@`
		`%{install_bindir}/clang++-%{maj_ver}`
		`%{install_bindir}/clang-cl`
		`%{install_bindir}/clang-cpp`
		`- %{_sysconfdir}/%{pkg_name_clang}/clang.cfg`
		`+ %{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang.cfg`
		`+ %{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang++.cfg`
		`%if %{without compat_build}`
		`%{_mandir}/man1/clang.1.gz`
		`%{_mandir}/man1/clang++.1.gz`
		`@@ -113,6 +334,7 @@`
		`%endif`

		`%files -n %{pkg_name_clang}-libs`
		`+ %license clang/LICENSE.TXT`
		`%{install_prefix}/lib/clang/%{maj_ver}/include/*`
		`%{install_libdir}/.so.`
		`%if 0%{?fedora} == 38`
		`@@ -120,10 +342,13 @@`
		`%endif`

		`%files -n %{pkg_name_clang}-devel`
		`- %{install_libdir}/*.so`
		`+ %license clang/LICENSE.TXT`
		`+ %{install_libdir}/libclang-cpp.so`
		`+ %{install_libdir}/libclang.so`
		`%{install_includedir}/clang/`
		`%{install_includedir}/clang-c/`
		`- %{install_libdir}/cmake/*`
		`+ %{install_libdir}/cmake/clang`
		`+ %{install_libdir}/cmake/clang/*`
		`%{install_bindir}/clang-tblgen`
		`%if %{with compat_build}`
		`%{_bindir}/clang-tblgen-%{maj_ver}`
		`@@ -131,6 +356,7 @@`
		`%dir %{install_datadir}/clang/`

		`%files -n %{pkg_name_clang}-resource-filesystem`
		`+ %license clang/LICENSE.TXT`
		`%dir %{install_prefix}/lib/clang/`
		`%dir %{install_prefix}/lib/clang/%{maj_ver}/`
		`%ifarch x86_64 aarch64 %{ix86}`
		`@@ -144,6 +370,7 @@`
		`%endif`

		`%files -n %{pkg_name_clang}-analyzer`
		`+ %license clang/LICENSE.TXT`
		`%{install_bindir}/scan-view`
		`%{install_bindir}/scan-build`
		`%{install_bindir}/analyze-build`
		`@@ -172,6 +399,7 @@`


		`%files -n %{pkg_name_clang}-tools-extra`
		`+ %license clang-tools-extra/LICENSE.TXT`
		`%{install_bindir}/amdgpu-arch`
		`%{install_bindir}/clang-apply-replacements`
		`%{install_bindir}/clang-change-namespace`
		`@@ -239,6 +467,7 @@`
		`%{_bindir}/run-clang-tidy-%{maj_ver}`
		`%else`
		`%{_mandir}/man1/diagtool.1.gz`
		`+ %{_mandir}/man1/extraclangtools.1.gz`
		`%{_emacs_sitestartdir}/clang-format.el`
		`%{_emacs_sitestartdir}/clang-rename.el`
		`%{_emacs_sitestartdir}/clang-include-fixer.el`
		`@@ -252,9 +481,11 @@`


		`%files -n %{pkg_name_clang}-tools-extra-devel`
		`+ %license clang-tools-extra/LICENSE.TXT`
		`%{install_includedir}/clang-tidy/`

		`%files -n git-clang-format`
		`+ %license clang/LICENSE.TXT`
		`%{install_bindir}/git-clang-format`
		`%if %{with compat_build}`
		`%{_bindir}/git-clang-format-%{maj_ver}`
		`@@ -262,6 +493,7 @@`

		`%if %{without compat_build}`
		`%files -n python3-clang`
		`+ %license clang/LICENSE.TXT`
		`%{python3_sitelib}/clang/`
		`%endif`

		`@@ -274,14 +506,99 @@`
		`%files -n %{pkg_name_compiler_rt}`
		`%license compiler-rt/LICENSE.TXT`
		`%ifarch x86_64 aarch64 %{ix86}`
		`- %{_prefix}/lib/clang/%{maj_ver}/bin/*`
		`+ %{_prefix}/lib/clang/%{maj_ver}/bin/hwasan_symbolize`
		`+ %endif`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/fuzzer`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/fuzzer/*`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/orc`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/orc/*`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/profile`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/profile/*`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/sanitizer`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/sanitizer/*`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/xray`
		`+ %{_prefix}/lib/clang/%{maj_ver}/include/xray/*`
		`+`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/asan_ignorelist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/asan_ignorelist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/cfi_ignorelist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/cfi_ignorelist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/dfsan_abilist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/hwasan_ignorelist.txt`
		`+ %{_prefix}/lib/clang/%{maj_ver}/share/msan_ignorelist.txt`
		`+`
		`+ # Files that appear both in x86_64 and i686`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan-preinit.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_static.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.builtins.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi_diag.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_interceptors.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_no_main.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.gwp_asan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.lsan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.profile.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.safestack.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats_client.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.so`
		`+`
		`+ # Files that don't appear in i686`
		`+ %ifnarch %{ix86}`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dd.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dyndd.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan-preinit.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof-preinit.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.so`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a.syms`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-basic.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-fdr.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-profiling.a`
		`+ %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a`
		`%endif`
		`- %{_prefix}/lib/clang/%{maj_ver}/include/*`
		`- %{_prefix}/lib/clang/%{maj_ver}/lib/*`
		`- %{_prefix}/lib/clang/%{maj_ver}/share/*`
		`- #%ifarch x86_64 aarch64`
		`- #{_bindir}/hwasan_symbolize`
		`- #%endif`

		`%endif`

		`@@ -301,15 +618,11 @@`
		`%ifnarch %{ix86} %{arm}`
		`# libomptarget is not supported on 32-bit systems.`
		`# s390x does not support the offloading plugins.`
		`- %ifnarch s390x`
		`- %{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}`
		`- %{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}`
		`- %{_libdir}/libomptarget.rtl.host.so.%{so_suffix}`
		`- %endif`
		`%{_libdir}/libomptarget.so.%{so_suffix}`
		`%endif`

		`%files -n %{pkg_name_libomp}-devel`
		`+ %license openmp/LICENSE.TXT`
		`%{_prefix}/lib/clang/%{maj_ver}/include/omp.h`
		`%{_prefix}/lib/clang/%{maj_ver}/include/ompx.h`
		`%ifnarch %{arm}`
		`@@ -321,11 +634,6 @@`
		`%ifnarch %{ix86} %{arm}`
		`# libomptarget is not supported on 32-bit systems.`
		`# s390x does not support the offloading plugins.`
		`- %ifnarch s390x`
		`- %{_libdir}/libomptarget.rtl.amdgpu.so`
		`- %{_libdir}/libomptarget.rtl.cuda.so`
		`- %{_libdir}/libomptarget.rtl.host.so`
		`- %endif`
		`%{_libdir}/libomptarget.devicertl.a`
		`%{_libdir}/libomptarget-amdgpu-*.bc`
		`%{_libdir}/libomptarget-nvptx-*.bc`
		`@@ -339,7 +647,7 @@`
		`#region LLD files`

		`%files -n %{pkg_name_lld}`
		`- %license LICENSE.TXT`
		`+ %license lld/LICENSE.TXT`
		`%ghost %{_bindir}/ld`
		`%{install_bindir}/lld*`
		`%{install_bindir}/ld.lld`
		`@@ -348,15 +656,19 @@`
		`%if %{without compat_build}`
		`%{_mandir}/man1/ld.lld.1*`
		`%else`
		`+ # TODO(kkleine): The compat package probably needs adjustments because`
		`+ # we most certainly don't want to package every binary but only those for lld.`
		`%{_bindir}/*-%{maj_ver}`
		`%endif`

		`%files -n %{pkg_name_lld}-devel`
		`+ %license lld/LICENSE.TXT`
		`%{install_includedir}/lld`
		`%{install_libdir}/liblld*.so`
		`%{install_libdir}/cmake/lld/`

		`%files -n %{pkg_name_lld}-libs`
		`+ %license lld/LICENSE.TXT`
		`%{install_libdir}/liblld.so.`

		`#endregion`

globals.spec.inc

file modified

		`@@ -19,6 +19,9 @@`

		`# Suffixless tarball name (essentially: basename -s .tar.xz llvm-project-17.0.6.src.tar.xz)`
		`%global src_tarball_dir llvm-project-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src`
		`+ %if %{with snapshot_build}`
		`+ %global src_tarball_dir llvm-project-%{llvm_snapshot_git_revision}`
		`+ %endif`

		`%global _lto_cflags -flto=thin`

install.spec.inc

file modified

+10 -1

		`@@ -106,6 +106,10 @@`

		`%if %{with compat_build}`

		`+ # TODO(kkleine): I don't know if the removal of every binary`
		`+ # below is what we want to do in big-merge for compat packages.`
		`+ # Re-evaluate this!`
		`+`
		`# Remove binaries/other files`
		`rm -Rf %{buildroot}%{install_bindir}`
		`rm -Rf %{buildroot}%{install_prefix}/share`
		`@@ -194,7 +198,8 @@`
		`# Install config file for clang`
		`%if %{maj_ver} >=18`
		`mkdir -p %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/`
		`- echo "--gcc-triple=%{_arch}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/clang.cfg`
		`+ echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang.cfg`
		`+ echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang++.cfg`
		`%endif`

		`#endregion`
		`@@ -226,6 +231,10 @@`
		`# chmod go+w %{buildroot}/%{_datarootdir}/gdb/python/ompd/ompdModule.so`
		`# chmod +w %{buildroot}/%{_datarootdir}/gdb/python/ompd/ompdModule.so`

		`+ # Remove files that we don't package, yet.`
		`+ rm %{buildroot}%{install_bindir}/llvm-omp-device-info`
		`+ rm %{buildroot}%{install_bindir}/llvm-omp-kernel-replay`
		`+`
		`%endif`

		`#endregion`

llvm.spec

file modified

+12 -4

		`@@ -84,19 +84,27 @@`
		`%endif`
		`%include %{_sourcedir}/check.spec.inc`

		`- %ldconfig_scriptlets libs`
		`+ %ldconfig_scriptlets -n %{pkg_name-llvm}-libs`

		`%post -n %{pkg_name_llvm}-devel`
		`%if %{undefined rhel}`
		`exec &>> >(/usr/bin/ts)`
		`%endif`
		`- %include %{_sourcedir}/post_devel.spec.inc`
		`+ %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}`
		`+ %if %{without compat_build}`
		`+ %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}`
		`+ %endif`
tuliom commented a month ago This change LGTM, but an important part of the code is missing. See https://src.fedoraproject.org/rpms/llvm/c/43a62dabf0c6be28d0263a895f80ab90895e3dcd `%postun` should also have more code.

		`%postun -n %{pkg_name_llvm}-devel`
		`%if %{undefined rhel}`
		`- exec &>> >(/usr/bin/ts)`
		`+ exec &>> >(/usr/bin/ts)`
		`+ %endif`
		`+ if [ $1 -eq 0 ]; then`
		`+ %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}`
		`+ %if %{without compat_build}`
		`+ %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}`
		`%endif`
		`- %include %{_sourcedir}/postun_devel.spec.inc`
		`+ fi`

		`%include %{_sourcedir}/files.spec.inc`

packages.spec.inc

file modified

+4 -8

		`@@ -87,9 +87,6 @@`
		`%package -n %{pkg_name_clang}`
		`Summary: A C language family front-end for LLVM`

		`- License: Apache-2.0 WITH LLVM-exception OR NCSA`
		`- URL: http://llvm.org`
		`-`
		`BuildRequires: libxml2-devel`
		`BuildRequires: perl-generators`

		`@@ -245,7 +242,6 @@`
		`Summary: LLVM "compiler-rt" runtime libraries`

		`License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT`
		`- URL: http://llvm.org`

		`BuildRequires: python3`

		`@@ -268,7 +264,6 @@`
		`%package -n %{pkg_name_libomp}`
		`Summary: OpenMP runtime for clang`

		`- License: Apache-2.0 WITH LLVM-exception OR NCSA`
		`URL: http://openmp.llvm.org`

		`# For clang-offload-packager`
		`@@ -285,11 +280,15 @@`

		`%package -n %{pkg_name_libomp}-devel`
		`Summary: OpenMP header files`
		`+`
		`+ URL: http://openmp.llvm.org`
		`+`
		`Requires: %{name}%{?isa} = %{version}-%{release}`
		`Requires: clang-resource-filesystem%{?isa} = %{version}`

		`%description -n %{pkg_name_libomp}-devel`
		`OpenMP header files.`
		`+ URL: http://openmp.llvm.org`

		`%endif`

		`@@ -300,9 +299,6 @@`
		`%package -n %{pkg_name_lld}`
		`Summary: The LLVM Linker`

		`- License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT`
		`- URL: http://llvm.org`
		`-`
		`BuildRequires: clang`
		`BuildRequires: cmake`
		`BuildRequires: ninja-build`

post_devel.spec.inc

file removed

-4

		`@@ -1,4 +0,0 @@`
		`- %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}`
		`- %if %{without compat_build}`
		`- %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}`
		`- %endif`

postun_devel.spec.inc

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- if [ $1 -eq 0 ]; then`
		`- %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}`
		`- %if %{without compat_build}`
		`- %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}`
		`- %endif`
		`- fi`
		`\ No newline at end of file`

sources.spec.inc

file modified

+1 -3

		`@@ -1,5 +1,5 @@`
		`%if %{with snapshot_build}`
		`- Source0: %{llvm_snapshot_source_prefix}llvm-project-%{llvm_snapshot_yyyymmdd}.src.tar.xz`
		`+ Source0: https://github.com/llvm/llvm-project/archive/%{llvm_snapshot_git_revision}.tar.gz`
		`%else`
		`Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz`
		`Source1001: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz.sig`
		`@@ -22,7 +22,5 @@`
		`Source1006: install.spec.inc`
		`Source1008: patches.spec.inc`
		`Source1009: prep.spec.inc`
		`- Source1010: post_devel.spec.inc`
		`- Source1011: postun_devel.spec.inc`
		`Source1012: sources.spec.inc`
		`Source1013: packages.spec.inc`

no initial comment

1 new commit added

Manually list binaries and manpages files for the llvm package

a month ago

tuliom commented on line 16 of llvm.spec a month ago

This change LGTM, but an important part of the code is missing.
See https://src.fedoraproject.org/rpms/llvm/c/43a62dabf0c6be28d0263a895f80ab90895e3dcd

%postun should also have more code.

1 new commit added

Fixup for ead79795eb6a155b64badfae4e75f457853418fb

a month ago

5 new commits added

Add *.so libraries explicitly for clang-devel
Add /usr/share/man/man1/extraclangtools.1.gz to clang-tools-extra
List %license for each sub-package
Adjust URL: and License: tags
Add libomp-tools package

a month ago

2 new commits added

Manually associate files with compiler-rt
Add cmake files explicitly to clang-devel

22 days ago

12 new commits added

Manually associate files with compiler-rt
Add cmake files explicitly to clang-devel
Add *.so libraries explicitly for clang-devel
Add /usr/share/man/man1/extraclangtools.1.gz to clang-tools-extra
List %license for each sub-package
Adjust URL: and License: tags
Add libomp-tools package
Fixup for ead79795eb6a155b64badfae4e75f457853418fb
Manually list binaries and manpages files for the llvm package
Use LICENSE.TXT file from lld directory
Inline %post and %postun code for llvm-devel
Explicitly name %ldconfig_scriptlets for llvm-libs package

22 days ago

1 new commit added

Leave note for lld compat packaging

22 days ago

2 new commits added

Leave note on removal of all binaries when installing clang compat
Remove package libomp-tools

22 days ago

1 new commit added

Fix path to files.compiler-rt.spec.inc

22 days ago

2 new commits added

Remove OMP SOs
Use github source code archive

20 days ago

3 new commits added

List compiler-rt files
Fix paths for compiler-rt files
Add triple prefix to clang config files

20 days ago

nikic commented 20 days ago

This looks good to me.

Pull-Request has been merged by kkleine

19 days ago

tuliom commented 19 days ago

This change LGTM, but an important part of the code is missing.
See https://src.fedoraproject.org/rpms/llvm/c/43a62dabf0c6be28d0263a895f80ab90895e3dcd

%postun should also have more code.

I proposed a fix for this issue in https://src.fedoraproject.org/rpms/llvm/pull-request/204