Skip to content

Commit 52f8bdb

Browse files
authored
Merge pull request #5554 from adivinho/release-8.0.41-32
PKG-223 Packaging for release - 8.0.41-32
2 parents d74807c + e712fc5 commit 52f8bdb

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

build-ps/percona-server-8.0_builder.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,8 @@ build_srpm(){
712712
#
713713
cd ${WORKDIR}/rpmbuild/SOURCES
714714
wget https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh
715-
wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
716-
#wget http://jenkins.percona.com/downloads/boost/${BOOST_PACKAGE_NAME}.tar.gz
715+
#wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
716+
wget --no-check-certificate https://downloads.percona.com/downloads/packaging/boost/${BOOST_PACKAGE_NAME}.tar.gz
717717
tar vxzf ${WORKDIR}/${TARFILE} --wildcards '*/build-ps/rpm/*.patch' --strip=3
718718
tar vxzf ${WORKDIR}/${TARFILE} --wildcards '*/build-ps/rpm/filter-provides.sh' --strip=3
719719
tar vxzf ${WORKDIR}/${TARFILE} --wildcards '*/build-ps/rpm/filter-requires.sh' --strip=3

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,39 @@
88
+TARGET_LINK_LIBRARIES(client_base mysqlclient)
99
--- client/CMakeLists.txt 2018-08-18 03:29:59.708213642 -0400
1010
+++ client/CMakeLists.txt 2018-08-18 03:29:59.712547041 -0400
11-
@@ -48,13 +48,13 @@
11+
@@ -49,13 +49,13 @@
1212
client_query_attributes.cc
1313
multi_factor_passwordopt-vars.cc
1414
${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
1515
- LINK_LIBRARIES perconaserverclient client_base ${MY_XLINE_LIBRARY}
1616
+ LINK_LIBRARIES mysqlclient client_base ${MY_XLINE_LIBRARY}
1717
)
18-
18+
1919
IF(NOT WITHOUT_SERVER)
2020
MYSQL_ADD_EXECUTABLE(mysql_upgrade
2121
upgrade/program.cc
2222
- LINK_LIBRARIES perconaserverclient client_base
2323
+ LINK_LIBRARIES mysqlclient client_base
2424
)
2525
ENDIF()
26-
27-
@@ -72,7 +72,7 @@
26+
27+
@@ -73,37 +73,32 @@
2828
COMPONENT Test
2929
DEPENDENCIES GenError GenClientError
3030
ENABLE_EXPORTS
3131
- LINK_LIBRARIES perconaserverclient
3232
+ LINK_LIBRARIES mysqlclient
3333
)
34+
-
3435
IF (WITH_COREDUMPER)
3536
TARGET_LINK_LIBRARIES(mysqltest coredumper)
36-
@@ -82,22 +82,22 @@
37+
ENDIF()
38+
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
3744
check/mysqlcheck.cc
3845
check/mysqlcheck_core.cc
3946
multi_factor_passwordopt-vars.cc
@@ -58,18 +65,19 @@
5865
- LINK_LIBRARIES perconaserverclient
5966
+ LINK_LIBRARIES mysqlclient
6067
)
61-
68+
6269
OPTION(WITH_JSON_BINLOG_LIBRARY
63-
@@ -229,7 +229,7 @@
70+
@@ -269,7 +264,8 @@
6471
SET(MYSQLBINLOG_LIBRARIES
6572
binlogevents_static
6673
client_base
6774
- perconaserverclient
6875
+ mysqlclient
76+
+ extra::rapidjson
6977
)
70-
78+
7179
IF(WITH_JSON_BINLOG_LIBRARY)
72-
@@ -263,20 +263,20 @@
80+
@@ -311,20 +307,20 @@
7381
MYSQL_ADD_EXECUTABLE(mysqladmin
7482
mysqladmin.cc
7583
multi_factor_passwordopt-vars.cc

0 commit comments

Comments
 (0)