diff --git a/fix-build-error-for-loongarch64.patch b/fix-build-error-for-loongarch64.patch new file mode 100644 index 0000000000000000000000000000000000000000..4f67eb1b5577a8f09467919cf140f809a45db88a --- /dev/null +++ b/fix-build-error-for-loongarch64.patch @@ -0,0 +1,25 @@ +From 6932d2776fa2aa08023df31abc582c46b8afd819 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Thu, 13 Jun 2024 19:53:42 +0800 +Subject: [PATCH] fix build error for loongarch64 + +--- + cmake/fileutils.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/fileutils.cmake b/cmake/fileutils.cmake +index f24530bb..8bb742f8 100644 +--- a/cmake/fileutils.cmake ++++ b/cmake/fileutils.cmake +@@ -133,7 +133,7 @@ IF(LINUX) + STRING(REGEX MATCH + "^[ ]+NEEDED[ ]+([-+_A-Za-z0-9\\.]+)" UNUSED ${LINE}) + IF(CMAKE_MATCH_1) +- IF(CMAKE_MATCH_1 STREQUAL "ld-linux-x86-64.so.2" OR CMAKE_MATCH_1 STREQUAL "ld-linux-aarch64.so.1" OR CMAKE_MATCH_1 STREQUAL "ld-linux-riscv64-lp64d.so.1") ++ IF(CMAKE_MATCH_1 STREQUAL "ld-linux-x86-64.so.2" OR CMAKE_MATCH_1 STREQUAL "ld-linux-aarch64.so.1" OR CMAKE_MATCH_1 STREQUAL "ld-linux-riscv64-lp64d.so.1" OR CMAKE_MATCH_1 STREQUAL ld-linux-loongarch-lp64d.so.1) + SET(CMAKE_MATCH_1 "libdl.so.2") + ENDIF() + LIST(APPEND DEPENDENCIES ${CMAKE_MATCH_1}) +-- +2.43.0 + diff --git a/mysql.spec b/mysql.spec index 23011d2d1410753b49c2e26f0e1d6c18e0f664df..dd072309b1c68991b350ff81f7aedfd1bf9c5636 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.37 -Release: 1 +Release: 2 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 @@ -64,6 +64,7 @@ Patch125: boost-1.57.0-mpl-print.patch Patch128: riscv-lock-free.patch %endif Patch129: fix-protobuf-version-22-and-up.patch +Patch130: fix-build-error-for-loongarch64.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4 BuildRequires: lz4-devel mecab-devel bison libzstd-devel @@ -235,6 +236,7 @@ popd %patch128 -p1 %endif %patch129 -p1 +%patch130 -p1 pushd mysql-test add_test () { echo "$1" : BUG#0 "${@:2}" >> %{skiplist} @@ -549,6 +551,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Thu Jun 13 2024 Wenlong Zhang - 8.0.37-2 +- fix build error for loongarch64 + * Tue May 07 2024 wangkai <13474090681@163.com> - 8.0.37-1 - Update to 8.0.37 for fix CVEs(CVE-2024-20964,CVE-2024-20971,CVE-2024-20976, CVE-2024-20973,CVE-2024-20978,CVE-2024-20981,CVE-2024-20962,CVE-2024-20977,