!139 [sync] PR-137: fix build error for loongarch64
From: @openeuler-sync-bot Reviewed-by: @wang--ge Signed-off-by: @wang--ge
This commit is contained in:
commit
f7e9ca1205
25
fix-build-error-for-loongarch64.patch
Normal file
25
fix-build-error-for-loongarch64.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 6932d2776fa2aa08023df31abc582c46b8afd819 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||||
|
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
|
||||||
|
|
||||||
@ -30,7 +30,7 @@
|
|||||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Name: mysql
|
Name: mysql
|
||||||
Version: 8.0.37
|
Version: 8.0.37
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
URL: http://www.mysql.com
|
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
|
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
|
Patch128: riscv-lock-free.patch
|
||||||
%endif
|
%endif
|
||||||
Patch129: fix-protobuf-version-22-and-up.patch
|
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: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4
|
||||||
BuildRequires: lz4-devel mecab-devel bison libzstd-devel
|
BuildRequires: lz4-devel mecab-devel bison libzstd-devel
|
||||||
@ -235,6 +236,7 @@ popd
|
|||||||
%patch128 -p1
|
%patch128 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch129 -p1
|
%patch129 -p1
|
||||||
|
%patch130 -p1
|
||||||
pushd mysql-test
|
pushd mysql-test
|
||||||
add_test () {
|
add_test () {
|
||||||
echo "$1" : BUG#0 "${@:2}" >> %{skiplist}
|
echo "$1" : BUG#0 "${@:2}" >> %{skiplist}
|
||||||
@ -549,6 +551,9 @@ fi
|
|||||||
%{_mandir}/man1/mysql_config.1*
|
%{_mandir}/man1/mysql_config.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 13 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 8.0.37-2
|
||||||
|
- fix build error for loongarch64
|
||||||
|
|
||||||
* Tue May 07 2024 wangkai <13474090681@163.com> - 8.0.37-1
|
* 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,
|
- 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,
|
CVE-2024-20973,CVE-2024-20978,CVE-2024-20981,CVE-2024-20962,CVE-2024-20977,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user