Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Sun, 14 Oct 2018 23:20:26
Message-Id: 1539559181.e1379f95b711bf310eb3723674d8fc2af69548be.whissi@gentoo
1 commit: e1379f95b711bf310eb3723674d8fc2af69548be
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 14 23:19:41 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 23:19:41 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=e1379f95
7
8 Add 20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 ...ona-server-5.7.23-rocksdb-use-system-libs.patch | 50 ++++++++++++++++++++++
13 1 file changed, 50 insertions(+)
14
15 diff --git a/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch b/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch
16 new file mode 100644
17 index 0000000..98494ae
18 --- /dev/null
19 +++ b/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch
20 @@ -0,0 +1,50 @@
21 +--- a/storage/rocksdb/CMakeLists.txt
22 ++++ b/storage/rocksdb/CMakeLists.txt
23 +@@ -114,38 +114,11 @@ EXECUTE_PROCESS(
24 + # split the list into lines
25 + STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
26 +
27 +-# add bundled compression code
28 +-SET(ROCKSDB_LIB_SOURCES
29 +- ${ROCKSDB_LIB_SOURCES}
30 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c
31 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c
32 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c
33 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
34 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
35 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
36 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c
37 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c
38 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c
39 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c
40 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c
41 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c
42 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c
43 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c
44 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c
45 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c
46 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c
47 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c
48 +-)
49 +-
50 + INCLUDE_DIRECTORIES(
51 + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
52 + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
53 + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb
54 + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src
55 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib
56 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib
57 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common
58 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder
59 + )
60 +
61 + ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
62 +@@ -177,7 +150,7 @@ SET(ROCKSDB_SOURCES
63 + ${ROCKSDB_LIB_SOURCES}
64 + )
65 +
66 +-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt")
67 ++SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd")
68 +
69 + MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
70 + LINK_LIBRARIES ${rocksdb_static_libs}