Compare commits
No commits in common. "b836522309b22b1a089b30a3e05c1782771fcb90" and "cce9781e9cc6de1b78d7b64dd3d0053085017f3d" have entirely different histories.
b836522309
...
cce9781e9c
@ -1,75 +0,0 @@
|
||||
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
|
||||
@@ -61,6 +61,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" "sw64")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
|
||||
set(_java_libarch "alpha")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
|
||||
@@ -363,6 +365,7 @@
|
||||
${JAVA_INCLUDE_PATH}/solaris
|
||||
${JAVA_INCLUDE_PATH}/hp-ux
|
||||
${JAVA_INCLUDE_PATH}/alpha
|
||||
+ ${JAVA_INCLUDE_PATH}/sw_64
|
||||
${JAVA_INCLUDE_PATH}/aix
|
||||
)
|
||||
|
||||
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
|
||||
@@ -280,9 +280,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
|
||||
@@ -1917,6 +1917,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));
|
||||
32
cmake.spec
32
cmake.spec
@ -11,7 +11,7 @@
|
||||
|
||||
Name: cmake
|
||||
Version: 3.22.0
|
||||
Release: 9
|
||||
Release: 4
|
||||
Summary: Cross-platform make system
|
||||
License: BSD and MIT and zlib
|
||||
URL: http://www.cmake.org
|
||||
@ -24,10 +24,6 @@ Source5: cmake.req
|
||||
Patch0: cmake-findruby.patch
|
||||
Patch1: cmake-fedora-flag_release.patch
|
||||
Patch2: cmake-mingw-dl.patch
|
||||
%ifarch sw_64
|
||||
Patch3: cmake-3.22.0-sw.patch
|
||||
%endif
|
||||
Patch4: fix-messy-code-for-openssl-1.1.1wa-version.patch
|
||||
|
||||
BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed
|
||||
BuildRequires: emacs python3-devel pkgconfig(Qt5Widgets) desktop-file-utils
|
||||
@ -45,9 +41,6 @@ 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)
|
||||
@ -138,6 +131,11 @@ for f in ccmake cmake cpack ctest;
|
||||
do
|
||||
ln -s $f %{buildroot}%{_bindir}/${f}3;
|
||||
done
|
||||
install -d %{buildroot}%{_datadir}/bash-completion/completions
|
||||
for f in %{buildroot}%{_datadir}/cmake/completions/*
|
||||
do
|
||||
ln -s ../../cmake/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions
|
||||
done
|
||||
install -d %{buildroot}%{_emacs_sitelispdir}/cmake
|
||||
install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el
|
||||
%{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el
|
||||
@ -203,13 +201,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%files data -f data_files.mf
|
||||
%{_datadir}/aclocal/cmake.m4
|
||||
%{bash_completionsdir}/c*
|
||||
%{_datadir}/bash-completion
|
||||
%{_emacs_sitelispdir}/cmake
|
||||
%{_emacs_sitelispdir}/cmake-mode.el
|
||||
%{_emacs_sitestartdir}/cmake-init.el
|
||||
%{_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
|
||||
|
||||
@ -238,21 +235,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%exclude %{_pkgdocdir}/Copyright.txt
|
||||
|
||||
%changelog
|
||||
* Sun Apr 28 2024 wangkai <13474090681@163.com> - 3.22.0-9
|
||||
- Fix messy code for openssl-1.1.1wa version
|
||||
|
||||
* Fri Feb 2 2024 liyanan <liyanan61@h-partners.com> - 3.22.0-8
|
||||
- Remove Windows_TemporaryKey.pfx
|
||||
|
||||
* Thu Dec 14 2023 liyanan <liyanan61@h-partners.com> - 3.22.0-7
|
||||
- Fix abnormal empty link in cmake-data package
|
||||
|
||||
* Thu Aug 10 2023 herengui <herengui@kylinsec.com.cn> - 3.22.0-6
|
||||
- fix sw_64 portmidi Could NOT find JNI
|
||||
|
||||
* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 3.22.0-5
|
||||
- add sw64 patch
|
||||
|
||||
* Wed Mar 2 2022 wangchen <wangchen137@h-partners.com> - 3.22.0-4
|
||||
- Remove rhash-devel from BuildRequires
|
||||
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
|
||||
index 8474e05c..ac742855 100644
|
||||
--- a/Modules/FindOpenSSL.cmake
|
||||
+++ b/Modules/FindOpenSSL.cmake
|
||||
@@ -520,7 +520,6 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
||||
from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
|
||||
# 96 is the ASCII code of 'a' minus 1
|
||||
math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
|
||||
- unset(_tmp)
|
||||
# Once anyone knows how OpenSSL would call the patch versions beyond 'z'
|
||||
# this should be updated to handle that, too. This has not happened yet
|
||||
# so it is simply ignored here for now.
|
||||
@@ -528,6 +527,16 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
||||
endif ()
|
||||
|
||||
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
|
||||
+
|
||||
+ if ("${_tmp}" GREATER 26)
|
||||
+ # openssl version 1.1.1wa get text directly
|
||||
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_text
|
||||
+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[^\"]*\".*")
|
||||
+ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[a-zA-Z]+" version_number ${openssl_version_text})
|
||||
+ set(OPENSSL_VERSION "${version_number}")
|
||||
+ endif ()
|
||||
+ unset(_tmp)
|
||||
+
|
||||
else ()
|
||||
# Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
|
||||
# a new OPENSSL_VERSION_STR macro contains exactly that
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user