From 47ad6f6e9dd3b91b426dcf73451a08b37daf6a2c Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 15 Jan 2025 11:25:42 +0800 Subject: [PATCH] default to out-of-source build --- cmake.spec | 5 ++++- macros.cmake.in | 14 +------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/cmake.spec b/cmake.spec index b5cd9ce..4b5fd64 100644 --- a/cmake.spec +++ b/cmake.spec @@ -28,7 +28,7 @@ Name: cmake Version: 3.27.9 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 8 +Release: 9 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: http://www.cmake.org @@ -319,6 +319,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Jan 23 2025 Funda Wang - 3.27.9-9 +- default to out-of-source build + * Thu Jan 23 2025 fuanan - 3.27.9-8 - remove the architecture judgment in the patches section; - include all patches in the source package. diff --git a/macros.cmake.in b/macros.cmake.in index cddccd9..accad53 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -2,8 +2,6 @@ # Macros for cmake # -%__cmake_in_source_build 1 - %_cmake_lib_suffix64 -DLIB_SUFFIX=64 %_cmake_lib_suffixilp32 -DLIB_SUFFIX=ilp32 %_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON @@ -11,17 +9,7 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest -%__cmake_builddir %{lua: - if rpm.expand('%{__cmake_in_source_build}') == '%{__cmake_in_source_build}' then - print(rpm.expand('%{_vpath_builddir}')) - else - if rpm.expand('%{__cmake_in_source_build}') == '0' then - print(rpm.expand('%{_vpath_builddir}')) - else - print(".") - end - end -} +%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} %_cmake_module_linker_flags %(echo %build_ldflags|sed -e 's#-Wl,--no-undefined##') # - Set default compile flags -- Gitee