automatic import of cmakeopeneuler24.03_LTS

6 files changed, 95 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index b548052..51be6dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /cmake-3.27.9.tar.gz
-/cmake-3.20.2.tar.gz
diff --git a/cmake-3.22.0-sw.patch b/cmake-3.22.0-sw.patch
new file mode 100755
index 0000000..b2e7a2c
--- /dev/null
+++ b/cmake-3.22.0-sw.patch
@@ -0,0 +1,76 @@
+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")
+@@ -509,6 +511,7 @@
+   ${JAVA_INCLUDE_PATH}/solaris
+   ${JAVA_INCLUDE_PATH}/hp-ux
+   ${JAVA_INCLUDE_PATH}/alpha
++  ${JAVA_INCLUDE_PATH}/sw_64
+   ${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 @@
+     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(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
+@@ -363,6 +363,10 @@
+ #elif defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
+ # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
+ 
++/* Sw_64 */
++#elif defined(__sw_64) || defined(__sw_64__) || defined(_M_SW_64)
++# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
++
+ /* 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
+@@ -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__)
+ #  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
+@@ -1849,6 +1849,10 @@
+     case PROCESSOR_ARCHITECTURE_MIPS:
+       uv__strscpy(buffer->machine, "mips", sizeof(buffer->machine));
+       break;
++    case PROCESSOR_ARCHITECTURE_SW_64:
++    case PROCESSOR_ARCHITECTURE_SW_6464:
++      uv__strscpy(buffer->machine, "sw_64", sizeof(buffer->machine));
++      break;
+     case PROCESSOR_ARCHITECTURE_ALPHA:
+     case PROCESSOR_ARCHITECTURE_ALPHA64:
+       uv__strscpy(buffer->machine, "alpha", sizeof(buffer->machine));
diff --git a/cmake.attr b/cmake.attr
index f9724b6..83f3f1a 100644
--- a/cmake.attr
+++ b/cmake.attr
@@ -1,3 +1,3 @@
 %__cmake_provides	%{_rpmconfigdir}/cmake.prov
 %__cmake_requires	%{_rpmconfigdir}/cmake.req
-%__cmake_path		^(/usr/lib(64|ilp32)?|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$
+%__cmake_path		^(%{_libdir}|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$
diff --git a/cmake.req b/cmake.req
index 5dea386..9af5c44 100644
--- a/cmake.req
+++ b/cmake.req
@@ -45,8 +45,6 @@ class CMakeParser:
                 has_module = True
                 if re.match(".*/usr/lib(64)?/cmake/.*", modulePath):
                     is_arched = True
-                elif re.match(".*/usr/libilp32/cmake/.*", modulePath):
-                    is_arched = True
 
         if has_module:
             if is_arched:
diff --git a/cmake.spec b/cmake.spec
index 855bcab..4c1cb27 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -2,17 +2,10 @@
 %bcond_without ncurses
 %bcond_without X11_test
 
-%ifarch aarch64_ilp32
-%bcond_with cmake_gui
-%bcond_with emacs
-%bcond_without bootstrap
-%bcond_with sphinx
-%else
 %bcond_without cmake_gui
 %bcond_without emacs
 %bcond_with bootstrap
 %bcond_without sphinx
-%endif
 
 # Do not build non-lto objects to reduce build time significantly.
 %global build_cflags   %(echo '%{build_cflags}'   | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
@@ -28,7 +21,7 @@
 Name:           cmake
 Version:        3.27.9
 %global major_version %(echo %{version} | awk -F. '{print $1}')
-Release:        8
+Release:        10
 Summary:        Cross-platform make system
 License:        BSD-3-Clause AND MIT-open-group AND Zlib
 URL:            http://www.cmake.org
@@ -39,14 +32,8 @@ Source3:        cmake.attr
 Source4:        cmake.prov
 Source5:        cmake.req
 Patch0:         cmake-findruby.patch
-%ifarch sw_64
-Patch1:         cmake-3.22.0-sw.patch
-%endif
-Patch2:         cmake-3.27.9-fix-cxx-standard-check-issue.patch
-
-%ifarch aarch64_ilp32
-Patch6000:      backport-cmake-aarch64-ilp32-support.patch
-%endif
+Patch1:         cmake-3.27.9-fix-cxx-standard-check-issue.patch
+Patch2:         cmake-3.22.0-sw.patch
 
 BuildRequires:  coreutils findutils gcc-c++ gcc-gfortran sed
 
@@ -139,7 +126,12 @@ BuildArch:      noarch
 Documentation for cmake.
 
 %prep
-%autosetup -n cmake-%{version}%{?versuf} -p 1
+%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
@@ -316,9 +308,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_pkgdocdir}/Copyright.txt
 
 %changelog
-* Wed Nov 06 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-8
+* Sun Jan 26 2025 fuanan <fuanan3@h-partners.com> - 3.27.9-10
+- No longer support aarch64_ilp32 compilation
+
+* Thu Jan 23 2025 Funda Wang <fundawang@yeah.net> - 3.27.9-9
 - default to out-of-source build
 
+* Thu Jan 23 2025 fuanan <fuanan3@h-partners.com> - 3.27.9-8
+- remove the architecture judgment in the patches section;
+- include all patches in the source package.
+
 * Tue Nov 05 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-7
 - change __cmake_builddir definition based on numeric comparision
 - force define source and binary directory
diff --git a/macros.cmake.in b/macros.cmake.in
index 9e5dec1..24e3806 100644
--- a/macros.cmake.in
+++ b/macros.cmake.in
@@ -3,23 +3,12 @@
 #
 
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
-%_cmake_lib_suffixilp32 -DLIB_SUFFIX=ilp32
 %_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON
 %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %_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
@@ -48,9 +37,6 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
-%if "%{?_lib}" == "libilp32" \
-        %{?_cmake_lib_suffixilp32} \\\
-%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}