From 06ed23ede52fcbea09aad4418d9597c53d1adcf9 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Sat, 18 May 2024 07:51:12 +0000 Subject: [PATCH] fix build error for loongarch64 --- fix-build-error-for-loongarch64.patch | 25 +++++++++++++++++++++++++ mysql.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 fix-build-error-for-loongarch64.patch diff --git a/fix-build-error-for-loongarch64.patch b/fix-build-error-for-loongarch64.patch new file mode 100644 index 0000000..5c45c7f --- /dev/null +++ b/fix-build-error-for-loongarch64.patch @@ -0,0 +1,25 @@ +From 8c8d148c723d3ea08a1123799264c58fc288b1bf Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Sat, 18 May 2024 08:02:25 +0000 +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 191e8bf6..e35d040e 100644 +--- a/cmake/fileutils.cmake ++++ b/cmake/fileutils.cmake +@@ -130,7 +130,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 9a4b18c..6561ce6 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.35 -Release: 3 +Release: 4 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD-2-Clause @@ -66,6 +66,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 @@ -236,6 +237,7 @@ popd %patch128 -p1 %endif %patch129 -p1 +%patch130 -p1 pushd mysql-test add_test () { echo "$1" : BUG#0 "${@:2}" >> %{skiplist} @@ -550,6 +552,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Sat May 18 2024 Wenlong Zhang - 8.0.35-4 +- fix build error for loongarch64 + * Fri Mar 22 2024 laokz - 8.0.35-3 - Add riscv64 to fix-protobuf-version-22-and-up.patch -- Gitee