packages/mysql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add riscv64 to fix-protobuf-version-22-and-up

Browse Source 
(cherry picked from commit c0e5a74fc47b42d5cd028492c04d99d0b29c8e89)
This commit is contained in:
laokz 2024-03-22 12:30:12 +08:00 committed by openeuler-sync-bot
parent 49243d7cbd
commit 421664c2b8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fix-protobuf-version-22-and-up.patch
View File

@ -19,7 +19,7 @@ index da98301..22dfb8d 100644
- "^[ ]+NEEDED[ ]+([-_A-Za-z0-9\\.]+)" UNUSED ${LINE}) - "^[ ]+NEEDED[ ]+([-_A-Za-z0-9\\.]+)" UNUSED ${LINE})
+ "^[ ]+NEEDED[ ]+([-+_A-Za-z0-9\\.]+)" UNUSED ${LINE}) + "^[ ]+NEEDED[ ]+([-+_A-Za-z0-9\\.]+)" UNUSED ${LINE})
IF(CMAKE_MATCH_1) 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") + 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")
+ SET(CMAKE_MATCH_1 "libdl.so.2") + SET(CMAKE_MATCH_1 "libdl.so.2")
+ ENDIF() + ENDIF()
LIST(APPEND DEPENDENCIES ${CMAKE_MATCH_1}) LIST(APPEND DEPENDENCIES ${CMAKE_MATCH_1})

5
mysql.spec
View File

@ -30,7 +30,7 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release} %global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: mysql Name: mysql
Version: 8.0.35 Version: 8.0.35
Release: 2 Release: 3
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: GPLv2 with exceptions and LGPLv2 and BSD-2-Clause License: GPLv2 with exceptions and LGPLv2 and BSD-2-Clause
@ -550,6 +550,9 @@ fi
%{_mandir}/man1/mysql_config.1* %{_mandir}/man1/mysql_config.1*
%changelog %changelog
* Fri Mar 22 2024 laokz <zhangkai@iscas.ac.cn> - 8.0.35-3
- Add riscv64 to fix-protobuf-version-22-and-up.patch
* Sun Feb 18 2024 Ge Wang <wang__ge@126.com> - 8.0.35-2 * Sun Feb 18 2024 Ge Wang <wang__ge@126.com> - 8.0.35-2
- Fix protobuf version 22 and up - Fix protobuf version 22 and up