community/percona-server to 8.0.20_11-1

This commit is contained in:
Kevin Mihelich 2020-07-25 16:37:34 +00:00
parent 93288904cc
commit 5cf81b9e36
3 changed files with 12 additions and 69 deletions

View file

@ -7,7 +7,7 @@
pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
pkgver=8.0.19_10
pkgver=8.0.20_11
_boost_ver=1.70.0
_pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*}
@ -22,15 +22,13 @@ source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona
'mysql-user.conf'
'build-hostname.patch'
'no-werror.patch'
'rocksdb-systemlibs.patch'
'rocksdb-make.patch'
'0001-fix-LF_PINS-padding-calculation.patch')
sha256sums=('b819d81b9cdef497dd5fd1044ddb033d222b986cf610cb5d4bb1fa5010dba580'
sha256sums=('929a1660f584bb3be49c579c1a2edd2a6a839c37fc4b275b843e90fba5cc77c0'
'882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9'
'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
'1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70'
'1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd'
'2343a191c452b91caa458b03b0c1ef3f5afb0e7031816c68467af5c6a6ffe253'
'2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03'
'aa5e960625843b061f47c32b4a267fab1115667b8b7d1ce7ec952efe42eb77af')
@ -40,7 +38,6 @@ prepare() {
patch -p1 -i "$srcdir"/build-hostname.patch
patch -p1 -i "$srcdir"/no-werror.patch
patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
patch -p1 -i "$srcdir"/rocksdb-make.patch
for svcfile in mysqld{,@}.service.in; do
@ -74,19 +71,18 @@ build() {
-DINSTALL_DOCDIR=share/doc/percona-server \
-DINSTALL_MANDIR=share/man \
-DINSTALL_PLUGINDIR=lib/perconaserver/plugin \
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_INCLUDEDIR=include/perconaserver \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DINSTALL_MYSQLSHAREDIR=share/mysql \
-DINSTALL_STATIC_LIBRARIES=OFF \
-DWITH_ZLIB=system \
-DWITH_LZ4=system \
-DWITH_ZSTD=system \
-DWITH_SSL=system \
-DWITH_ICU=system \
-DWITH_LIBWRAP=OFF \
-DWITH_MECAB=OFF \
-DWITH_PAM=ON \
-DWITH_EMBEDDED_SERVER=ON \
-DWITH_EMBEDDED_SHARED_LIBRARY=ON \
-DWITH_INNODB_MEMCACHED=ON \
-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
@ -104,7 +100,6 @@ build() {
-DUSE_CSCOPE=OFF \
-DTOKUDB_BACKUP_PLUGIN_VERSION=$_pkgver \
-DWITH_SYSTEMD=1 \
-DWITH_SCALABILITY_METRICS=ON \
-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
-DWITH_BOOST=system \
-DWITH_NUMA=OFF \
@ -124,7 +119,7 @@ package_libperconaserverclient() {
done
# Conflicting files with mariadb-libs
rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,perconaserver}
rm -rf "$pkgdir"/usr/lib/{libmysqld.so.*,libmysqlclient{,_r}.so*,perconaserver}
install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config
install -Dm644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1
@ -180,7 +175,7 @@ package_percona-server() {
# provided by libperconaserverclient
rm usr/bin/mysql_config
rm usr/lib/lib{mysql,perconaserver}*
rm usr/lib/libperconaserverclient*
rm -r usr/include/
rm usr/share/man/man1/mysql_config.1
rm -r usr/share/aclocal usr/lib/pkgconfig

View file

@ -1,9 +1,9 @@
diff --git a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
index b10edec3..fb04ed59 100644
index 9d2c1dd2..cefa9190 100644
--- a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
+++ b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
@@ -13,7 +13,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
_FILE_OFFSET_BITS=64
@@ -20,7 +20,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
_FILE_OFFSET_BITS=64
_LARGEFILE64_SOURCE)
-set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
@ -12,10 +12,10 @@ index b10edec3..fb04ed59 100644
set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers")
if (USE_VALGRIND)
diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
index 502fd192..6d178667 100644
index 92897b88..95dad8ac 100644
--- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
@@ -206,8 +206,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang)
@@ -171,8 +171,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang)
endif ()
## always want these

View file

@ -1,52 +0,0 @@
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index b8b698d..cef5336 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -116,38 +116,11 @@ EXECUTE_PROCESS(
# split the list into lines
STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
-# add bundled compression code
-SET(ROCKSDB_LIB_SOURCES
- ${ROCKSDB_LIB_SOURCES}
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c
-)
-
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb
${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder
)
ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
@@ -184,7 +157,7 @@ SET(ROCKSDB_SOURCES
${ROCKSDB_LIB_SOURCES}
)
-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt")
+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd")
MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
LINK_LIBRARIES ${rocksdb_static_libs}