diff --git a/clang-13.0.0-arm-add-latomic.patch b/clang-13.0.0-arm-add-latomic.patch new file mode 100644 index 0000000..a7fe887 --- /dev/null +++ b/clang-13.0.0-arm-add-latomic.patch @@ -0,0 +1,10 @@ +--- clang-13.0.0.src/tools/extra/clangd/CMakeLists.txt.orig 2021-11-02 16:57:53.561981660 +0100 ++++ clang-13.0.0.src/tools/extra/clangd/CMakeLists.txt 2021-11-02 16:58:11.225804323 +0100 +@@ -168,6 +168,7 @@ + clangTidy + + clangdSupport ++ atomic + ) + if(CLANGD_TIDY_CHECKS) + target_link_libraries(clangDaemon PRIVATE ${ALL_CLANG_TIDY_CHECKS}) diff --git a/clang.spec b/clang.spec index 9e955b3..b8df6e4 100644 --- a/clang.spec +++ b/clang.spec @@ -2,8 +2,8 @@ %define MAJver %(echo %version | cut -d. -f1) %define majver %(echo %version | cut -d. -f1-2) Name: clang -Version: 11.1.0 -Release: 3mamba +Version: 13.0.0 +Release: 1mamba Summary: C language family frontend for LLVM Group: Development/Languages Vendor: openmamba @@ -12,6 +12,7 @@ Packager: Silvan Calarco URL: https://llvm.org/ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-%{version}.src.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-tools-extra-%{version}.src.tar.xz +Patch0: clang-13.0.0-arm-add-latomic.patch License: NCSA ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -66,21 +67,22 @@ This package includes the lib%{name} API documentation. %prep %setup -q -a1 -n %{name}-%{version}.src -#% setup -q -n %{name}-%{version}.src -#-D -T +#% setup -q -n %{name}-%{version}.src -D -T #:<< _EOF - mv clang-tools-extra-%{version}.src tools/extra +%ifarch arm +%patch0 -p1 +%endif + %build #:<< __EOF - mkdir -p build cd build cmake .. -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_SHARED_LIBS=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ @@ -95,7 +97,7 @@ cmake .. -G Ninja \ -DSPHINX_WARNINGS_AS_ERRORS=OFF #-DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" - +:<< __EOF ninja %{_smp_mflags} %install @@ -107,22 +109,18 @@ ninja install rm -f %{buildroot}%{_datadir}/doc/clang/html/.buildinfo -# legacy libclang.so.11 symlink to libclang.so.11.1 -ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} +## legacy libclang.so.11 symlink to libclang.so.11.1 +#ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -/sbin/ldconfig -: - -%postun -/sbin/ldconfig -: +%post -n lib%{name} -p /sbin/ldconfig +%postun -n lib%{name} -p /sbin/ldconfig %files %defattr(-,root,root) +%{_bindir}/analyze-build %{_bindir}/c-index-test %{_bindir}/clang %{_bindir}/clang++ @@ -132,15 +130,19 @@ ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} %{_bindir}/find-all-symbols %{_bindir}/git-clang-format %{_bindir}/hmaptool +%{_bindir}/intercept-build %{_bindir}/modularize %{_bindir}/pp-trace +%{_bindir}/run-clang-tidy %{_bindir}/scan-build +%{_bindir}/scan-build-py %{_bindir}/scan-view -%{_prefix}/libexec/c++-analyzer -%{_prefix}/libexec/ccc-analyzer -%dir %{_libdir}/clang -#%dir %{_libdir}/clang/%{version} -#%{_libdir}/clang/%{version}/* +%dir %{_prefix}/lib/libear +%{_prefix}/lib/libear/* +%dir %{_prefix}/lib/libscanbuild +%{_prefix}/lib/libscanbuild/* +# FIXME: should be libexec64 on 64 bits archs +%{_prefix}/libexec/* %dir %{_datadir}/clang/ %{_datadir}/clang/* %dir %{_datadir}/scan-build @@ -151,12 +153,12 @@ ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} %{_mandir}/man1/diagtool.1* %{_mandir}/man1/extraclangtools.1* %{_mandir}/man1/scan-build.1* -%doc LICENSE.TXT %files -n lib%{name} %defattr(-,root,root) %{_libdir}/libclang*.so.* %{_libdir}/libfindAllSymbols.so.* +%doc LICENSE.TXT %files -n lib%{name}-devel %defattr(-,root,root) @@ -168,6 +170,8 @@ ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} %{_includedir}/clang-tidy/* %{_libdir}/libclang*.so %{_libdir}/libfindAllSymbols.so +%dir %{_libdir}/clang +%dir %{_libdir}/clang/%{version} %dir %{_libdir}/clang/%{version}/include %{_libdir}/clang/%{version}/include/* %dir %{_libdir}/cmake/clang @@ -182,6 +186,9 @@ ln -s libclang.so.%{majver} %{buildroot}%{_libdir}/libclang.so.%{MAJver} %{_docdir}/clang-tools/* %changelog +* Fri Oct 22 2021 Silvan Calarco 13.0.0-1mamba +- update to 13.0.0 + * Mon May 17 2021 Silvan Calarco 11.1.0-3mamba - rebuilt with -DCLANG_LINK_CLANG_DYLIB=ON