- added libexecdir patch, consistently package binaries from both scan-build in libex...

[packages/llvm.git] / llvm.spec

diff --git a/llvm.spec b/llvm.spec
index 088ea70b47d7582550ee0d1b39908561b79657c4..eb5590557fd16428475dabf43daee94b1b4fea40 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -62,7 +62,7 @@ Summary:      The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):     Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:          llvm
 Version:       13.0.0
-Release:       2
+Release:       3
 License:       University of Illinois/NCSA Open Source License
 Group:         Development/Languages
 #Source0Download: https://github.com/llvm/llvm-project/releases/
@@ -93,6 +93,7 @@ Patch5:               %{name}-ocaml-shared.patch
 Patch6:                %{name}-flang.patch
 Patch7:                llvm12-build_fixes.patch
 Patch8:                %{name}-selective_bindings.patch
+Patch9:                %{name}-libexecdir.patch
 URL:           http://llvm.org/
 BuildRequires: bash
 BuildRequires: binutils-devel
@@ -122,7 +123,7 @@ BuildRequires:      rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.742
 %{?with_doc:BuildRequires:     sphinx-pdg}
 BuildRequires: tar >= 1:1.22
-BuildRequires: xar-devel
+BuildRequires: xar-devel >= 1.6
 BuildRequires: xz
 %{?with_z3:BuildRequires:      z3-devel >= 4.7.1}
 BuildRequires: zlib-devel
@@ -168,7 +169,6 @@ BuildRequires:      xz-devel
 %{?with_target_nvptx:BuildRequires:    ocl-icd-libOpenCL-devel}
 %endif
 %if %{with ocaml}
-BuildConflicts:        llvm-devel
 BuildConflicts:        llvm-ocaml
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
@@ -466,6 +466,7 @@ Summary(pl.UTF-8):  Pliki programistyczne narzędzi konsolidujących LLD
 Group:         Development/Tools
 URL:           http://lld.llvm.org/
 Requires:      %{name}-devel = %{version}-%{release}
+Requires:      xar-devel >= 1.6
 
 %description -n lld-devel
 Development files for LLD linker tools.
@@ -599,6 +600,7 @@ Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 %endif
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 grep -rl /usr/bin/env projects tools utils | xargs sed -i -e '1{
        s,^#!.*bin/env python,#!%{__python3},
@@ -693,11 +695,10 @@ rm -rf $RPM_BUILD_ROOT
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
-# Adjust static analyzer installation
-# http://clang-analyzer.llvm.org/installation#OtherPlatforms
-install -d $RPM_BUILD_ROOT%{_libdir}/scan-build
-%{__mv} $RPM_BUILD_ROOT%{_prefix}/libexec/c??-analyzer $RPM_BUILD_ROOT%{_libdir}/scan-build
-%{__sed} -i -e 's,/\.\./libexec/,/../%{_lib}/scan-build/,' $RPM_BUILD_ROOT%{_bindir}/scan-build
+# Adjust static analyzer installation (see -libexecdir patch)
+abs_ca_libexecdir="%{_libexecdir}/clang-analyzer"
+rel_ca_libexecdir="${abs_ca_libexecdir#%{_prefix}}"
+%{__sed} -i -e "s,/\.\./libexec/,/..${rel_ca_libexecdir}/," $RPM_BUILD_ROOT%{_bindir}/scan-build
 %py3_comp $RPM_BUILD_ROOT%{_datadir}/scan-view
 %py3_ocomp $RPM_BUILD_ROOT%{_datadir}/scan-view
 
@@ -943,7 +944,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/clang/%{version}/bin
 %attr(755,root,root) %{_libdir}/clang/%{version}/bin/hwasan_symbolize
 %endif
-%ifarch %{ix86} %{x8664} aarch64
+%ifarch %{ix86} %{x8664} aarch64 armv7hl armv7hnl
 %dir %{_libdir}/clang/%{version}/lib
 %dir %{_libdir}/clang/%{version}/lib/linux
 %dir %{_libdir}/clang/%{version}/share
@@ -972,10 +973,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-aarch64.so
 %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-aarch64.a.syms
 %endif
+%ifarch armv7hl armv7hnl
+%{_libdir}/clang/%{version}/lib/linux/clang_rt.*-armhf.o
+%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-armhf.a
+%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-armhf.so
+%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-armhf.a.syms
+%endif
 %ifarch %{ix86} %{x8664} %{arm} aarch64 mips mips64 ppc64
 %{_libdir}/clang/%{version}/share/asan_ignorelist.txt
 %endif
-%ifarch %{ix86} %{x8664} mips64 aarch64
+%ifarch %{ix86} %{x8664} mips64 aarch64 armv7hl armv7hnl
 %{_libdir}/clang/%{version}/share/cfi_ignorelist.txt
 %endif
 %ifarch %{x8664} aarch64 mips64
@@ -1021,23 +1028,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n clang-analyzer
 %defattr(644,root,root,755)
+%dir %{_libexecdir}/clang-analyzer
+# perl tools
+%attr(755,root,root) %{_bindir}/scan-build
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/c++-analyzer
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/ccc-analyzer
+%{_datadir}/scan-build
+%{_mandir}/man1/scan-build.1*
+# python tools
 %attr(755,root,root) %{_bindir}/analyze-build
 %attr(755,root,root) %{_bindir}/intercept-build
-%attr(755,root,root) %{_bindir}/scan-build
 %attr(755,root,root) %{_bindir}/scan-build-py
 %attr(755,root,root) %{_bindir}/scan-view
-%attr(755,root,root) %{_libexecdir}/analyze-c++
-%attr(755,root,root) %{_libexecdir}/analyze-cc
-%attr(755,root,root) %{_libexecdir}/intercept-c++
-%attr(755,root,root) %{_libexecdir}/intercept-cc
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/analyze-c++
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/analyze-cc
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/intercept-c++
+%attr(755,root,root) %{_libexecdir}/clang-analyzer/intercept-cc
 %{_prefix}/lib/libear
 %{_prefix}/lib/libscanbuild
-%{_datadir}/scan-build
 %{_datadir}/scan-view
-%{_mandir}/man1/scan-build.1*
-%dir %{_libdir}/scan-build
-%attr(755,root,root) %{_libdir}/scan-build/c++-analyzer
-%attr(755,root,root) %{_libdir}/scan-build/ccc-analyzer
 
 %files -n clang-devel
 %defattr(644,root,root,755)