[arch-commits] Commit in percona-server/trunk (4 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Wed Dec 27 13:27:13 UTC 2017
Date: Wednesday, December 27, 2017 @ 13:27:12
Author: mtorromeo
Revision: 276231
upgpkg: percona-server 5.7.20_18-1
Added:
percona-server/trunk/rocksdb-systemlibs.patch
(from rev 276230, percona-server/trunk/rocksdb-systemdlibs.patch)
Modified:
percona-server/trunk/PKGBUILD
Deleted:
percona-server/trunk/gcc7-fixes.patch
percona-server/trunk/rocksdb-systemdlibs.patch
---------------------------+
PKGBUILD | 15 +++++--------
gcc7-fixes.patch | 26 -----------------------
rocksdb-systemdlibs.patch | 49 --------------------------------------------
rocksdb-systemlibs.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-27 13:25:45 UTC (rev 276230)
+++ PKGBUILD 2017-12-27 13:27:12 UTC (rev 276231)
@@ -3,26 +3,24 @@
pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=5.7.19_17
+pkgver=5.7.20_18
_boost_ver=1.59.0
_pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*}
-pkgrel=2
+pkgrel=1
arch=('x86_64')
makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'valgrind' 'pam' 'numactl' 'jemalloc' 'openssl')
license=('GPL')
url="https://www.percona.com/software/mysql-database/percona-server"
source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
- "https://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz"
+ "http://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz"
'my.cnf'
'mysql-user.conf'
- 'gcc7-fixes.patch'
- 'rocksdb-systemdlibs.patch')
-sha256sums=('a3651b46fac3fe1e694a2c5e3faf57dd665859473bd85b1dd2d3cd5c58fbf77a'
+ 'rocksdb-systemlibs.patch')
+sha256sums=('ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af'
'47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
- '0d6010539e54752bc9995e569bb813625369fef05be70d9542f0acb70497894a'
'aef17e069ea417dad053594d0dd919b2daf75cf5ae10da3743c3e293ccd533bf')
prepare() {
@@ -34,8 +32,7 @@
storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake \
plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
- patch -p1 -i "$srcdir"/gcc7-fixes.patch
- patch -p1 -i "$srcdir"/rocksdb-systemdlibs.patch
+ patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
}
build() {
Deleted: gcc7-fixes.patch
===================================================================
--- gcc7-fixes.patch 2017-12-27 13:25:45 UTC (rev 276230)
+++ gcc7-fixes.patch 2017-12-27 13:27:12 UTC (rev 276231)
@@ -1,26 +0,0 @@
-diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
-index 924ccd3..d5ce802 100644
---- a/storage/innobase/row/row0sel.cc
-+++ b/storage/innobase/row/row0sel.cc
-@@ -5221,7 +5221,7 @@ rec_loop:
- reporting due to search views etc. */
- if (prev_rec != NULL
- && prebuilt->m_mysql_handler->end_range != NULL
-- && prebuilt->idx_cond == false && end_loop >= 100) {
-+ && !prebuilt->idx_cond && end_loop >= 100) {
-
- dict_index_t* key_index = prebuilt->index;
- bool clust_templ_for_sec = false;
-diff --git a/sql-common/client_authentication.cc b/sql-common/client_authentication.cc
-index eaeb2d4..035ecd2 100644
---- a/sql-common/client_authentication.cc
-+++ b/sql-common/client_authentication.cc
-@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
-
- if (mysql->options.extension != NULL &&
- mysql->options.extension->server_public_key_path != NULL &&
-- mysql->options.extension->server_public_key_path != '\0')
-+ mysql->options.extension->server_public_key_path[0] != '\0')
- {
- pub_key_file= fopen(mysql->options.extension->server_public_key_path,
- "r");
Deleted: rocksdb-systemdlibs.patch
===================================================================
--- rocksdb-systemdlibs.patch 2017-12-27 13:25:45 UTC (rev 276230)
+++ rocksdb-systemdlibs.patch 2017-12-27 13:27:12 UTC (rev 276231)
@@ -1,49 +0,0 @@
-diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
-index ab4f5e9..3b13c70 100644
---- a/storage/rocksdb/CMakeLists.txt
-+++ b/storage/rocksdb/CMakeLists.txt
-@@ -56,35 +56,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
--)
--
- 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
- )
-
- ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DOS_LINUX
-@@ -116,7 +92,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}
Copied: percona-server/trunk/rocksdb-systemlibs.patch (from rev 276230, percona-server/trunk/rocksdb-systemdlibs.patch)
===================================================================
--- rocksdb-systemlibs.patch (rev 0)
+++ rocksdb-systemlibs.patch 2017-12-27 13:27:12 UTC (rev 276231)
@@ -0,0 +1,49 @@
+diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
+index ab4f5e9..3b13c70 100644
+--- a/storage/rocksdb/CMakeLists.txt
++++ b/storage/rocksdb/CMakeLists.txt
+@@ -56,35 +56,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
+-)
+-
+ 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
+ )
+
+ ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DOS_LINUX
+@@ -116,7 +92,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}
More information about the arch-commits
mailing list