Merge #139 compat_build fixes for clang 13

This commit is contained in:
Serge Guelton 2022-02-15 16:25:08 +00:00
commit 9e607ef75e

View File

@ -130,10 +130,12 @@ BuildRequires: libatomic
# We need python3-devel for %%py3_shebang_fix # We need python3-devel for %%py3_shebang_fix
BuildRequires: python3-devel BuildRequires: python3-devel
%if %{without compat_build}
# For reproducible pyc file generation # For reproducible pyc file generation
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility # See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
BuildRequires: /usr/bin/marshalparser BuildRequires: /usr/bin/marshalparser
%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib} %global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}
%endif
# Needed for %%multilib_fix_c_header # Needed for %%multilib_fix_c_header
BuildRequires: multilib-rpm-config BuildRequires: multilib-rpm-config
@ -334,7 +336,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
%endif %endif
%if %{with compat_build} %if %{with compat_build}
-DCLANG_BUILD_TOOLS:BOOL=OFF \ -DCLANG_BUILD_TOOLS:BOOL=OFF \
-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver} \ -DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \
-DCMAKE_INSTALL_PREFIX=%{install_prefix} \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
-DCLANG_INCLUDE_TESTS:BOOL=OFF \ -DCLANG_INCLUDE_TESTS:BOOL=OFF \
%else %else
@ -388,6 +390,8 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
rm -Rf %{buildroot}%{install_bindir} rm -Rf %{buildroot}%{install_bindir}
rm -Rf %{buildroot}%{install_prefix}/share rm -Rf %{buildroot}%{install_prefix}/share
rm -Rf %{buildroot}%{install_prefix}/libexec rm -Rf %{buildroot}%{install_prefix}/libexec
# Remove scanview-py helper libs
rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
%else %else