#139 compat_build fixes for clang 13
Merged 3 months ago by sergesanspaille. Opened 5 months ago by trix.
https://github.com/trixirt/clang-rpm compat_build-13  into  rawhide

compat_build: remove scanview helpers from buildroot
Tom Rix • 5 months ago  
compat_build: use llvm-config from the llvm compat build
Tom Rix • 5 months ago  
compat_build: remove pyc BuildRequires
Tom Rix • 5 months ago  
clang.spec
file modified
+5 -1
@@ -128,10 +128,12 @@

  # We need python3-devel for %%py3_shebang_fix

  BuildRequires:	python3-devel

  

+ %if %{without compat_build}

  # For reproducible pyc file generation

  # See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility

  BuildRequires: /usr/bin/marshalparser

  %global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}

+ %endif

  

  # Needed for %%multilib_fix_c_header

  BuildRequires:	multilib-rpm-config
@@ -332,7 +334,7 @@

  %endif

  %if %{with compat_build}

  	-DCLANG_BUILD_TOOLS:BOOL=OFF \

- 	-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver} \

+ 	-DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \

@sergesanspaille Is this part needed?

  	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \

  	-DCLANG_INCLUDE_TESTS:BOOL=OFF \

  %else
@@ -386,6 +388,8 @@

  rm -Rf %{buildroot}%{install_bindir}

  rm -Rf %{buildroot}%{install_prefix}/share

  rm -Rf %{buildroot}%{install_prefix}/libexec

+ # Remove scanview-py helper libs

+ rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}

  

  %else

  

no initial comment

Resolving a couple of errors building on x86_64 rawhide with
rpmbuild -with compat_build -ba clang.spec

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

The failures happen before this change.

@tstellar: we could replace the call to llvm-config by -DCMAKE_MODULE_PATH:FILEPATH=%{install_prefix}/cmake/llvm

@tstellar: we could replace the call to llvm-config by -DCMAKE_MODULE_PATH:FILEPATH=%{install_prefix}/cmake/llvm

Do we even need this? Isn't that already one of the default module paths for CMake?

Pull-Request has been merged by sergesanspaille

3 months ago
Metadata