From c43ecf7402e5e2cd8e4e006804f2ee3fccd803fa Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 12 Nov 2024 21:58:10 +0800 Subject: [PATCH] adopt to new cmake macro --- llvm.spec | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/llvm.spec b/llvm.spec index 313c703..d2bbb80 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + %bcond_without sys_llvm %bcond_without check %bcond_with classic_flang @@ -44,7 +46,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 19 +Release: 20 Summary: The Low Level Virtual Machine License: NCSA @@ -194,10 +196,7 @@ pathfix.py -i %{__python3} -pn \ utils/update_cc_test_checks.py %build -mkdir -p _build -cd _build - -%cmake .. -G Ninja \ +%cmake -G Ninja \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DLLVM_PARALLEL_LINK_JOBS=%{max_link_jobs} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -254,26 +253,26 @@ cd _build -DLLVM_ENABLE_AUTOTUNER=ON \ %endif -DLLVM_INCLUDE_BENCHMARKS=OFF -%ninja_build LLVM -%ninja_build +%cmake_build --target LLVM +%cmake_build %install -%ninja_install -C _build +%cmake_install mkdir -p %{buildroot}/%{_bindir} # Install binaries needed for lit tests for f in llvm-isel-fuzzer llvm-opt-fuzzer do - install -m 0755 %{_builddir}/llvm-%{version}.src/_build/bin/$f %{buildroot}%{install_bindir} + install -m 0755 %{_builddir}/llvm-%{version}.src/%{__cmake_builddir}/bin/$f %{buildroot}%{install_bindir} done %if 0%{?__isa_bits} == 64 -install %{_builddir}/llvm-%{version}.src/_build/lib64/libLLVMTestingSupport.a %{buildroot}%{install_libdir} -install %{_builddir}/llvm-%{version}.src/_build/lib64/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir} +install %{_builddir}/llvm-%{version}.src/%{__cmake_builddir}/lib64/libLLVMTestingSupport.a %{buildroot}%{install_libdir} +install %{_builddir}/llvm-%{version}.src/%{__cmake_builddir}/lib64/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir} %else -install %{_builddir}/llvm-%{version}.src/_build/lib/libLLVMTestingSupport.a %{buildroot}%{install_libdir} -install %{_builddir}/llvm-%{version}.src/_build/lib/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir} +install %{_builddir}/llvm-%{version}.src/%{__cmake_builddir}/lib/libLLVMTestingSupport.a %{buildroot}%{install_libdir} +install %{_builddir}/llvm-%{version}.src/%{__cmake_builddir}/lib/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir} %endif # Install gtest sources so clang can use them for gtest @@ -307,7 +306,7 @@ cp -Rv ../cmake/* %{buildroot}%{install_datadir}/llvm/cmake %check %if %{with check} -LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C ./_build/ +LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake_builddir} %endif %ldconfig_scriptlets libs @@ -375,6 +374,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C ./_build %{install_includedir}/llvm-gmock %changelog +* Wed Nov 06 2024 Funda Wang - 17.0.6-20 +- adopt to new cmake macro + * Mon Sep 23 2024 zhanglimin - 17.0.6-19 - [LoongArch] Backport some new support -- Gitee