diff --git a/libcxx.spec b/libcxx.spec index 1b9554f..b46529d 100644 --- a/libcxx.spec +++ b/libcxx.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + %bcond_without sys_llvm %bcond_without check %bcond_without toolchain_clang @@ -39,7 +41,7 @@ Name: %{pkg_name} Version: %{libcxx_version} -Release: 3%{?dist} +Release: 4 Summary: LLVM "libcxx" runtime libraries License: Apache-2.0 URL: http://llvm.org @@ -160,8 +162,6 @@ cp ../%{runtimes_cmakedir}/WarningFlags.cmake runtimes/cmake/Modules/ #%py3_shebang_fix libcxx/utils/ %build -mkdir -p _build -cd _build # Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files. export ASMFLAGS=$CFLA @@ -189,14 +189,11 @@ export ASMFLAGS=$CFLA %if %{with bisheng_autotuner} -DLLVM_ENABLE_AUTOTUNER=ON \ %endif - .. -%ninja_build +%cmake_build %install -cd _build - -%ninja_install +%cmake_install # We can't install the unversionned path on default location because that would conflict with # https://src.fedoraproject.org/rpms/libunwind # @@ -214,7 +211,6 @@ popd rm %{buildroot}%{_pkgdocdir}/html/.buildinfo -%ldconfig_scriptlets %files %license libcxx/LICENSE.TXT %doc libcxx/CREDITS.TXT libcxx/TODO.TXT @@ -269,6 +265,10 @@ rm %{buildroot}%{_pkgdocdir}/html/.buildinfo %doc %{_pkgdocdir}/html %changelog +* Thu Nov 07 2024 Funda Wang - 17.0.6-4 +- adopt to new cmake macro +- force out-of-source build + * Tue Aug 20 2024 liyunfei - 17.0.6-3 - Add BiSheng Autotuner support.