diff --git a/llvm-toolset-19.spec b/llvm-toolset-19.spec index ef8e589aa1bd715da1807fd43fd620298566912f..bee9d201c5144b5b2505f43c8da859786aeb4162 100644 --- a/llvm-toolset-19.spec +++ b/llvm-toolset-19.spec @@ -149,7 +149,7 @@ #region main package Name: llvm-toolset-%{maj_ver} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 5 +Release: 6 Summary: The Low Level Virtual Machine License: NCSA @@ -1409,12 +1409,14 @@ install -D -m 644 -t %{buildroot}%{_mandir}/man1/ lld/docs/ld.lld.1 liblldb=$(basename $(readlink -e %{buildroot}%{install_libdir}/liblldb.so)) %if %{with sys_llvm} mkdir -p %{buildroot}%{python3_sitearch} -mv %{buildroot}%{install_prefix}/..%{python3_sitearch}/lldb %{buildroot}%{python3_sitearch}/lldb +# /usr/../usr/lib64 == /usr/lib64, in which case mv (or cp -r) would complain +# mv %{buildroot}%{install_prefix}/..%{python3_sitearch}/lldb %{buildroot}%{python3_sitearch}/lldb ln -vsf "../../../${liblldb}" %{buildroot}%{python3_sitearch}/lldb/_lldb.so %py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/lldb -%endif +%else rm -rf %{buildroot}%{install_prefix}/..%{python3_sitearch}/lldb %endif +%endif #endregion LLDB installation #region mlir installation @@ -1928,8 +1930,10 @@ fi #endregion LLVM lit files #region LLVM files +%if %{without sys_llvm} %files -n llvm-toolset-%{maj_ver} %{_scl_scripts}/enable +%endif %files -n %{pkg_name_llvm} %license llvm/LICENSE.TXT @@ -2810,6 +2814,9 @@ fi #endregion files %changelog +* Tue Mar 11 2025 jchzhou - 19.1.7-6 +- Fix two minor packaging issues + * Mon Mar 03 2025 jchzhou - 19.1.7-5 - Fix packaging issues as sys_llvm, adapt for scan-build install path changes