diff --git a/mysql-Add-sw64-architecture.patch b/mysql-Add-sw64-architecture.patch index 02445fb829d7985b3961f34263534f2006911657..592ffdd42e7ef131482fcc6082088e22222caa5b 100644 --- a/mysql-Add-sw64-architecture.patch +++ b/mysql-Add-sw64-architecture.patch @@ -14,14 +14,8 @@ Signed-off-by: wxy .../boost_1_77_0/boost/predef/architecture.h | 1 + .../boost/predef/architecture/sw_64.h | 54 + boost/boost_1_77_0/boost/wave/wave_config.hpp | 2 +- - .../icu/icu-release-73-1/source/acinclude.m4 | 6 + - .../icu/icu-release-73-1/source/config.guess | 8 + - extra/icu/icu-release-73-1/source/config.sub | 2 + - extra/icu/icu-release-73-1/source/configure | 8 +- - .../icu/icu-release-73-1/source/configure.ac | 2 +- .../source/i18n/double-conversion-utils.h | 2 +- - extra/rapidjson/include/rapidjson/rapidjson.h | 2 +- - 16 files changed, 1319 insertions(+), 5 deletions(-) + 10 files changed, 1319 insertions(+), 5 deletions(-) create mode 100644 boost/boost_1_77_0/boost/atomic/detail/caps_arch_gcc_sw_64.hpp create mode 100644 boost/boost_1_77_0/boost/atomic/detail/core_arch_ops_gcc_sw_64.hpp create mode 100644 boost/boost_1_77_0/boost/atomic/detail/fence_arch_ops_gcc_sw_64.hpp @@ -1396,127 +1390,6 @@ index dce42d43..abd3d977 100644 defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING) #define BOOST_WAVE_STRINGTYPE std::string -diff --git a/extra/icu/icu-release-73-1/source/acinclude.m4 b/extra/icu/icu-release-73-1/source/acinclude.m4 -index 507f41f5..344471c0 100644 ---- a/extra/icu/icu-release-73-1/source/acinclude.m4 -+++ b/extra/icu/icu-release-73-1/source/acinclude.m4 -@@ -21,6 +21,12 @@ case "${host}" in - else - icu_cv_host_frag=mh-solaris - fi ;; -+sw_64*-*-linux-gnu) -+ if test "$GCC" = yes; then -+ icu_cv_host_frag=mh-sw_64-linux-gcc -+ else -+ icu_cv_host_frag=mh-sw_64-linux-cc -+ fi ;; - alpha*-*-linux-gnu) - if test "$GCC" = yes; then - icu_cv_host_frag=mh-alpha-linux-gcc -diff --git a/extra/icu/icu-release-73-1/source/config.guess b/extra/icu/icu-release-73-1/source/config.guess -index 31e01efe..3eb10f96 100644 ---- a/extra/icu/icu-release-73-1/source/config.guess -+++ b/extra/icu/icu-release-73-1/source/config.guess -@@ -894,6 +894,14 @@ EOF - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -+ sw_64:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ sw) UNAME_MACHINE=sw_64 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi -+ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -diff --git a/extra/icu/icu-release-73-1/source/config.sub b/extra/icu/icu-release-73-1/source/config.sub -index fb579478..ad7fd2a7 100644 ---- a/extra/icu/icu-release-73-1/source/config.sub -+++ b/extra/icu/icu-release-73-1/source/config.sub -@@ -245,6 +245,7 @@ case $basic_machine in - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ -+ | sw_64 \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -@@ -369,6 +370,7 @@ case $basic_machine in - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ -+ | sw_64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -diff --git a/extra/icu/icu-release-73-1/source/configure b/extra/icu/icu-release-73-1/source/configure -index a2ff7e48..a1902502 100755 ---- a/extra/icu/icu-release-73-1/source/configure -+++ b/extra/icu/icu-release-73-1/source/configure -@@ -5249,6 +5249,12 @@ case "${host}" in - else - icu_cv_host_frag=mh-solaris - fi ;; -+sw_64*-*-linux-gnu) -+ if test "$GCC" = yes; then -+ icu_cv_host_frag=mh-sw_64-linux-gcc -+ else -+ icu_cv_host_frag=mh-sw_64-linux-cc -+ fi ;; - alpha*-*-linux-gnu) - if test "$GCC" = yes; then - icu_cv_host_frag=mh-alpha-linux-gcc -@@ -6511,7 +6517,7 @@ if test "$CC" = ccc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"C compiler set to CCC ${CC}\" " >&5 - $as_echo "\"C compiler set to CCC ${CC}\" " >&6; } - case "${host}" in -- alpha*-*-*) U_HAVE_INTTYPES_H=0; -+ alpha*-*-* | sw_64*-*-*) U_HAVE_INTTYPES_H=0; - CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_INTTYPES_H=0" - esac - fi -diff --git a/extra/icu/icu-release-73-1/source/configure.ac b/extra/icu/icu-release-73-1/source/configure.ac -index 425fdc7b..73e26739 100644 ---- a/extra/icu/icu-release-73-1/source/configure.ac -+++ b/extra/icu/icu-release-73-1/source/configure.ac -@@ -685,7 +685,7 @@ fi - if test "$CC" = ccc; then - AC_MSG_RESULT("C compiler set to CCC ${CC}" ) - case "${host}" in -- alpha*-*-*) U_HAVE_INTTYPES_H=0; -+ alpha*-*-*|sw_64*-*-*) U_HAVE_INTTYPES_H=0; - CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_INTTYPES_H=0" - esac - fi -diff --git a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h -index c9374636..7dcdbf8e 100644 ---- a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h -+++ b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h -@@ -122,7 +122,7 @@ int main(int argc, char** argv) { - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ - defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ -- defined(__SH4__) || defined(__alpha__) || \ -+ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || \ - defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\ - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__e2k__) || \ -diff --git a/extra/rapidjson/include/rapidjson/rapidjson.h b/extra/rapidjson/include/rapidjson/rapidjson.h -index 329ce92b..50ce8e68 100644 ---- a/extra/rapidjson/include/rapidjson/rapidjson.h -+++ b/extra/rapidjson/include/rapidjson/rapidjson.h -@@ -239,7 +239,7 @@ - // Detect with architecture macros - # elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) - # define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN --# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) -+# elif defined(__i386__) || defined(__alpha__) || defined(__sw_64__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) - # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN - # elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64)) - # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN -- 2.33.0 diff --git a/mysql.spec b/mysql.spec index 075dfefeb26e411d4605b1f50603cee49d365805..3afcf28ed08947e6023d9bd65a0c0e4deaa193a9 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.43 -Release: 2 +Release: 3 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause @@ -545,6 +545,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Fri Sep 19 2025 zhang_chunjing - 8.0.43-3 +- fix mysql-Add-sw64-architecture.patch + * Mon Sep 15 2025 zhang_chunjing - 8.0.43-2 - fix sw patch