diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..f42624258df61535915b04a5f4a7f79fae80e144 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/cmake diff --git a/cmake-3.27.9-fix-cxx-standard-check-issue.patch b/cmake-3.27.9-fix-cxx-standard-check-issue.patch deleted file mode 100644 index af9e6a6a5414038b605824cacebf74e6e59a7f57..0000000000000000000000000000000000000000 --- a/cmake-3.27.9-fix-cxx-standard-check-issue.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake -index 02627464..4f6ccdaf 100644 ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -44,6 +44,8 @@ function(cm_check_cxx_feature name) - string(REGEX REPLACE "[^\n]*warning D[0-9][0-9][0-9][0-9][^\n]*" "" check_output "${check_output}") - # Filter out warnings caused by user flags. - string(REGEX REPLACE "[^\n]*warning:[^\n]*-Winvalid-command-line-argument[^\n]*" "" check_output "${check_output}") -+ # Filter out clang output warnings -+ string(REGEX REPLACE "[^\n]*warning:[^\n]*-Wunused-command-line-argument[^\n]*" "" check_output "${check_output}") - # Filter out warnings caused by local configuration. - string(REGEX REPLACE "[^\n]*warning:[^\n]*directory not found for option[^\n]*" "" check_output "${check_output}") - string(REGEX REPLACE "[^\n]*warning:[^\n]*object file compiled with -mlong-branch which is no longer needed[^\n]*" "" check_output "${check_output}") diff --git a/cmake-3.27.9.tar.gz b/cmake-3.27.9.tar.gz deleted file mode 100644 index 978f497df3b02535d63b093c9f6c8f3bcdf8f122..0000000000000000000000000000000000000000 Binary files a/cmake-3.27.9.tar.gz and /dev/null differ diff --git a/cmake-4.0.0-rc5.tar.gz b/cmake-4.0.0-rc5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..85d7be05d827309d394d36a2367987e880ccc952 --- /dev/null +++ b/cmake-4.0.0-rc5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e9daaee7664597ebdadbe598e7f132a74ca27f64429265c8fa3b4920a61387a +size 11825372 diff --git a/cmake-3.22.0-sw.patch b/cmake-4.0.0-sw.patch similarity index 44% rename from cmake-3.22.0-sw.patch rename to cmake-4.0.0-sw.patch index b2e7a2c6e99d2ffe4af47cca8172329cf84babae..d2846a480b8bd27bc6fd9ed79e658c00d506a8a2 100755 --- a/cmake-3.22.0-sw.patch +++ b/cmake-4.0.0-sw.patch @@ -1,15 +1,14 @@ -diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJNI.cmake ---- cmake-3.22.0.org/Modules/FindJNI.cmake 2022-02-25 01:21:55.530000000 +0000 -+++ cmake-3.22.0.sw/Modules/FindJNI.cmake 2022-02-25 01:30:19.530000000 +0000 -@@ -150,6 +150,8 @@ - set(_java_libarch "i386") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") - set(_java_libarch "arm64" "aarch64") -+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") -+ set(_java_libarch "sw_64") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") - set(_java_libarch "alpha") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") +--- cmake-4.0.0-rc2/Modules/FindJNI.cmake.orig 2025-02-25 23:56:02.000000000 +0800 ++++ cmake-4.0.0-rc2/Modules/FindJNI.cmake 2025-03-01 15:15:46.450910600 +0800 +@@ -147,6 +147,8 @@ + set(_java_libarch "i386") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(_java_libarch "arm64" "aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") ++ set(_java_libarch "sw_64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") + set(_java_libarch "alpha") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") @@ -509,6 +511,7 @@ ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux @@ -18,25 +17,19 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN ${JAVA_INCLUDE_PATH}/aix DOC "jni_md.h jniport.h include directory" ) - -diff -Naur cmake-3.22.0.org/Modules/GNUInstallDirs.cmake cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake ---- cmake-3.22.0.org/Modules/GNUInstallDirs.cmake 2022-02-25 01:21:55.550000000 +0000 -+++ cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake 2022-02-25 01:32:38.270000000 +0000 -@@ -286,9 +286,9 @@ +--- cmake-4.0.0-rc2/Modules/GNUInstallDirs.cmake.orig 2025-02-25 23:56:02.000000000 +0800 ++++ cmake-4.0.0-rc2/Modules/GNUInstallDirs.cmake 2025-03-01 15:18:07.470046200 +0800 +@@ -292,7 +292,7 @@ + endif() elseif(NOT DEFINED __system_type_for_install) # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P: - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -+ set(_LIBDIR_DEFAULT "lib") +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") ++ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") + set(_LIBDIR_DEFAULT "lib64") if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) -- set(__LAST_LIBDIR_DEFAULT "lib64") -+ set(__LAST_LIBDIR_DEFAULT "lib") - endif() - endif() - endif() -diff -Naur cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h ---- cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:21:57.660000000 +0000 -+++ cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:25:45.020000000 +0000 + set(__LAST_LIBDIR_DEFAULT "lib64") +--- cmake-4.0.0-rc2/Utilities/KWIML/include/kwiml/abi.h.orig 2025-02-25 23:56:02.000000000 +0800 ++++ cmake-4.0.0-rc2/Utilities/KWIML/include/kwiml/abi.h 2025-03-01 15:15:46.515317600 +0800 @@ -363,6 +363,10 @@ #elif defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE @@ -48,21 +41,19 @@ diff -Naur cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h cmake-3.22.0.sw/ /* Alpha */ #elif defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE -diff -Naur cmake-3.22.0.org/Utilities/cmlibrhash/librhash/byte_order.h cmake-3.22.0.sw/Utilities/cmlibrhash/librhash/byte_order.h ---- cmake-3.22.0.org/Utilities/cmlibrhash/librhash/byte_order.h 2022-02-25 01:21:57.810000000 +0000 -+++ cmake-3.22.0.sw/Utilities/cmlibrhash/librhash/byte_order.h 2022-02-25 01:26:26.980000000 +0000 +--- cmake-4.0.0-rc2/Utilities/cmlibrhash/librhash/byte_order.h.orig 2025-02-25 23:56:02.000000000 +0800 ++++ cmake-4.0.0-rc2/Utilities/cmlibrhash/librhash/byte_order.h 2025-03-01 15:15:46.484583500 +0800 @@ -75,7 +75,7 @@ /* try detecting endianness by CPU */ #ifdef RHASH_BYTE_ORDER #elif defined(CPU_IA32) || defined(CPU_X64) || defined(__ia64) || defined(__ia64__) || \ - defined(__alpha__) || defined(_M_ALPHA) || defined(vax) || defined(MIPSEL) || \ + defined(__alpha__) || defined(_M_ALPHA) || defined(__sw_64__) || defined(_M_SW_64) || defined(vax) || defined(MIPSEL) || \ - defined(_ARM_) || defined(__arm__) + defined(_ARM_) || defined(__arm__) || defined(_M_ARM64) || defined(_M_ARM64EC) || \ + defined(__loongarch64) # define RHASH_BYTE_ORDER RHASH_BYTE_ORDER_LE - #elif defined(__sparc) || defined(__sparc__) || defined(sparc) || \ -diff -Naur cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c ---- cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:21:57.830000000 +0000 -+++ cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:33:21.970000000 +0000 +--- cmake-4.0.0-rc2/Utilities/cmlibuv/src/win/util.c.orig 2025-02-25 23:56:02.000000000 +0800 ++++ cmake-4.0.0-rc2/Utilities/cmlibuv/src/win/util.c 2025-03-01 15:15:46.490604600 +0800 @@ -1849,6 +1849,10 @@ case PROCESSOR_ARCHITECTURE_MIPS: uv__strscpy(buffer->machine, "mips", sizeof(buffer->machine)); diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 72a8b258010a37de756bacc55502230ba7cc84d2..5de08eed4fda28526ea004c453c738142e275440 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,22 +1,30 @@ -Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake +Index: cmake-4.0.0-rc2/Modules/FindRuby.cmake =================================================================== ---- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake -+++ cmake-3.23.0-rc2/Modules/FindRuby.cmake -@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +--- cmake-4.0.0-rc2.orig/Modules/FindRuby.cmake ++++ cmake-4.0.0-rc2/Modules/FindRuby.cmake +@@ -285,14 +285,9 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) - # vendor_ruby available ? - execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" -- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) +- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) - -- if(Ruby_HAS_VENDOR_RUBY) +- if (Ruby_HAS_VENDOR_RUBY) - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) -- endif() -+ # vendor_ruby +- endif () ++# vendor_ruby + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) # save the results in the cache so we don't have to run ruby the next time again - set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) + set(_Ruby_EXECUTABLE_LAST_QUERIED "${Ruby_EXECUTABLE}" CACHE INTERNAL "The ruby executable last queried for version and path info") +@@ -306,7 +301,7 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA + set(Ruby_RUBY_LIB_DIR ${Ruby_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE) + set(Ruby_SITEARCH_DIR ${Ruby_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE) + set(Ruby_SITELIB_DIR ${Ruby_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE) +- set(Ruby_HAS_VENDOR_RUBY ${Ruby_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE) ++ set(Ruby_HAS_VENDOR_RUBY $ CACHE BOOL "Vendor Ruby is available" FORCE) + set(Ruby_VENDORARCH_DIR ${Ruby_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE) + set(Ruby_VENDORLIB_DIR ${Ruby_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE) diff --git a/cmake.spec b/cmake.spec index 500ce3055063713787021ec6d9d1a49d1aa7b7e7..0bb1729efcbfc890d842343bdc2e3639781388b6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -12,33 +12,31 @@ %global build_cxxflags %(echo '%{build_cxxflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') %global build_fflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') %global build_fcflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') -%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/cmake-%{version}} %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} Name: cmake -Version: 3.27.9 +Version: 4.0.0 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 10 +Release: 2 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: http://www.cmake.org -Source0: https://www.cmake.org/files/v3.27/cmake-%{version}.tar.gz +Source0: https://github.com/Kitware/CMake/releases/download/v4.0.0-rc4/cmake-%{version}-rc5.tar.gz Source1: cmake-init.el Source2: macros.cmake.in Source3: cmake.attr Source4: cmake.prov Source5: cmake.req Patch0: cmake-findruby.patch -Patch1: cmake-3.27.9-fix-cxx-standard-check-issue.patch -Patch2: cmake-3.22.0-sw.patch +Patch2: cmake-4.0.0-sw.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed %if %{with cmake_gui} -BuildRequires: pkgconfig(Qt5Widgets) desktop-file-utils +BuildRequires: pkgconfig(Qt6Widgets) desktop-file-utils %endif %if %{with emacs} @@ -60,12 +58,9 @@ BuildRequires: bzip2-devel curl-devel expat-devel jsoncpp-devel libarchive-deve BuildRequires: libuv-devel xz-devel zlib-devel cmake-rpm-macros %endif -BuildRequires: pkgconfig(bash-completion) -%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions') - Requires: cmake-data = %{version}-%{release} cmake-rpm-macros = %{version}-%{release} Requires: cmake-filesystem = %{version}-%{release} -Provides: cmake3 = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) +Provides: bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) %description CMake is used to control the software compilation process using simple @@ -126,17 +121,7 @@ BuildArch: noarch Documentation for cmake. %prep -%setup -n cmake-%{version}%{?versuf} -%patch 0 -p1 -%patch 1 -p1 -%ifarch sw_64 -%patch 2 -p1 -%endif - -echo '#!%{__python3}' > %{name}.prov -echo '#!%{__python3}' > %{name}.req -tail -n +2 %{SOURCE4} >> %{name}.prov -tail -n +2 %{SOURCE5} >> %{name}.req +%autosetup -p1 -n cmake-%{version}-rc5 %build export CFLAGS=`echo %{optflags} | sed 's/-g\b/-s/g'` @@ -171,9 +156,11 @@ install -d %{buildroot}%{_pkgdocdir} find %{buildroot}%{_datadir}/cmake/Modules -type f | xargs chmod -x for f in ccmake cmake cpack ctest; do - ln -s $f %{buildroot}%{_bindir}/${f}3; + ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done +rm -f %{buildroot}%{_datadir}/cmake/Templates/Windows/Windows_TemporaryKey.pfx + %if %{with emacs} install -d %{buildroot}%{_emacs_sitelispdir}/cmake install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el @@ -184,12 +171,12 @@ install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir} rm -f %{buildroot}%{_emacs_sitelispdir} %endif -install -p -m0644 -D %{S:2} %{buildroot}%{rpm_macros_dir}/macros.%{name} -sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{rpm_macros_dir}/macros.%{name} -touch -r %{S:2} %{buildroot}%{rpm_macros_dir}/macros.%{name} -install -p -m0644 -D %{S:3} %{buildroot}%{_prefix}/lib/rpm/fileattrs/cmake.attr -install -p -m0755 -D cmake.prov %{buildroot}%{_prefix}/lib/rpm/cmake.prov -install -p -m0755 -D cmake.req %{buildroot}%{_prefix}/lib/rpm/cmake.req +install -p -m0644 -D %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} +sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} +touch -r %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} +install -p -m0644 -D %{S:3} %{buildroot}%{_fileattrsdir}/cmake.attr +install -p -m0755 -D %{S:4} %{buildroot}%{_rpmconfigdir}/cmake.prov +install -p -m0755 -D %{S:5} %{buildroot}%{_rpmconfigdir}/cmake.req install -d %{buildroot}%{_libdir}/cmake find Source Utilities -type f -iname copy\* cp -p Source/kwsys/Copyright.txt ./Copyright_kwsys @@ -235,35 +222,14 @@ NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocInc bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure popd - -%if %{with cmake_gui} -%post gui -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/mime || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun gui -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/mime || : - update-mime-database %{_datadir}/mime &> /dev/null || : - touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans gui -update-mime-database %{_datadir}/mime &> /dev/null || : -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %files -f lib_files.mf %doc %dir %{_pkgdocdir} -%license Copyright_* COPYING* Copyright.txt +%license Copyright_* COPYING* LICENSE.rst %license LICENSE.cppdap NOTICE.cppdap %files data -f data_files.mf %{_datadir}/aclocal/cmake.m4 -%{_datadir}/bash-completion +%{bash_completions_dir}/* %if %{with emacs} %{_emacs_sitelispdir}/cmake %{_emacs_sitelispdir}/cmake-mode.el @@ -271,7 +237,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_datadir}/vim/vimfiles/indent/%{name}.vim %{_datadir}/vim/vimfiles/syntax/%{name}.vim -%exclude %{_datadir}/cmake/Templates/Windows/Windows_TemporaryKey.pfx %files filesystem -f data_dirs.mf -f lib_dirs.mf @@ -286,8 +251,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %files rpm-macros -%{rpm_macros_dir}/macros.cmake -%{_rpmconfigdir}/fileattrs/cmake.attr +%{_rpmmacrodir}/macros.cmake +%{_fileattrsdir}/cmake.attr %{_rpmconfigdir}/cmake.prov %{_rpmconfigdir}/cmake.req @@ -300,7 +265,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man7/*.7.* %if %{with cmake_gui} %if 0%{?build_cross} == 0 -%{_mandir}/man1/cmake-gui.1.* +%{_mandir}/man1/cmake-gui.1* %endif %endif %endif @@ -308,6 +273,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Mar 06 2025 Funda Wang - 4.0.0-2 +- 4.0.0 rc5 + * Sun Jan 26 2025 fuanan - 3.27.9-10 - No longer support aarch64_ilp32 compilation diff --git a/macros.cmake.in b/macros.cmake.in index 24e3806d8c003eba604d688a3d7470d661fe10cd..41485579eb5731bea82552e68c974e2a28612e08 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -2,7 +2,6 @@ # Macros for cmake # -%_cmake_lib_suffix64 -DLIB_SUFFIX=64 %_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON %_cmake_version @@CMAKE_VERSION@@ @@ -16,7 +15,7 @@ # and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS # - Turn on verbose makefiles so we can see and verify compile flags # - Turn off stripping by default so RPM can do it separately -# - Set default install prefixes and library install directories +# - Set default install prefixes # - Turn on shared libraries by default %cmake \ %{set_build_flags} \ @@ -29,14 +28,6 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=%{_rundir} \\\ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -%if "%{?_lib}" == "lib64" \ - %{?_cmake_lib_suffix64} \\\ -%endif \ %{?_cmake_shared_libs} \\\ %{?_cmake_module_linker_flags:-DCMAKE_MODULE_LINKER_FLAGS="%_cmake_module_linker_flags%{?_cmake_module_linker_flags_extra: %_cmake_module_linker_flags_extra}"} \\\ %{nil} @@ -56,7 +47,8 @@ %ifarch riscv64 \ --timeout 6000 \\\ %endif \ - %{?_smp_mflags} %{**} + %{?_smp_mflags} \\\ + %{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake