Skip to content

Commit fd17794

Browse files
committed
PKG-551 Packaging tasks for release - PS 8.0.42-33
1 parent be02aa6 commit fd17794

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

build-ps/rpm/mysql-5.7-sharedlib-rename.patch

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,16 @@
2424
)
2525
ENDIF()
2626

27-
@@ -73,37 +73,32 @@
27+
@@ -73,7 +73,7 @@
2828
COMPONENT Test
2929
DEPENDENCIES GenError GenClientError
3030
ENABLE_EXPORTS
3131
- LINK_LIBRARIES perconaserverclient
3232
+ LINK_LIBRARIES mysqlclient
3333
)
34-
-
35-
IF (WITH_COREDUMPER)
36-
TARGET_LINK_LIBRARIES(mysqltest coredumper)
37-
ENDIF()
3834

39-
-IF(MY_COMPILER_IS_GNU AND (WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO))
40-
- TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
41-
-ENDIF()
42-
-
43-
MYSQL_ADD_EXECUTABLE(mysqlcheck
35+
IF (WITH_COREDUMPER)
36+
@@ -88,22 +88,22 @@
4437
check/mysqlcheck.cc
4538
check/mysqlcheck_core.cc
4639
multi_factor_passwordopt-vars.cc
@@ -67,17 +60,16 @@
6760
)
6861

6962
OPTION(WITH_JSON_BINLOG_LIBRARY
70-
@@ -269,7 +264,8 @@
63+
@@ -269,7 +269,7 @@
7164
SET(MYSQLBINLOG_LIBRARIES
7265
binlogevents_static
7366
client_base
7467
- perconaserverclient
7568
+ mysqlclient
76-
+ extra::rapidjson
69+
extra::unordered_dense
7770
)
7871

79-
IF(WITH_JSON_BINLOG_LIBRARY)
80-
@@ -311,20 +307,20 @@
72+
@@ -312,20 +312,20 @@
8173
MYSQL_ADD_EXECUTABLE(mysqladmin
8274
mysqladmin.cc
8375
multi_factor_passwordopt-vars.cc

0 commit comments

Comments
 (0)