Date: Friday, May 4, 2018 @ 15:00:50 Author: mtorromeo Revision: 318947
archrelease: copy trunk to community-x86_64 Added: percona-server/repos/community-x86_64/PKGBUILD (from rev 318946, percona-server/trunk/PKGBUILD) percona-server/repos/community-x86_64/my.cnf (from rev 318946, percona-server/trunk/my.cnf) percona-server/repos/community-x86_64/mysql-tirpc.patch (from rev 318946, percona-server/trunk/mysql-tirpc.patch) percona-server/repos/community-x86_64/mysql-user.conf (from rev 318946, percona-server/trunk/mysql-user.conf) percona-server/repos/community-x86_64/rocksdb-systemlibs.patch (from rev 318946, percona-server/trunk/rocksdb-systemlibs.patch) Deleted: percona-server/repos/community-x86_64/PKGBUILD percona-server/repos/community-x86_64/my.cnf percona-server/repos/community-x86_64/mysql-user.conf percona-server/repos/community-x86_64/rocksdb-systemlibs.patch --------------------------+ PKGBUILD | 353 ++++++++++++++++++++++----------------------- my.cnf | 76 ++++----- mysql-tirpc.patch | 62 +++++++ mysql-user.conf | 2 rocksdb-systemlibs.patch | 104 ++++++------- 5 files changed, 332 insertions(+), 265 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-04 15:00:31 UTC (rev 318946) +++ PKGBUILD 2018-05-04 15:00:50 UTC (rev 318947) @@ -1,174 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgbase=percona-server -pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') -pkgver=5.7.21_20 -_boost_ver=1.59.0 -_pkgver=${pkgver/_/-} -_myver=${pkgver/_rel*} -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" - "http://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz" - 'my.cnf' - 'mysql-user.conf' - 'rocksdb-systemlibs.patch') -sha256sums=('842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6' - '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' - 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' - 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' - 'fcc3bea0982cda6cc35637d448a46924eccdfeb4c4da0634a26c9d190cf50fe4') - -prepare() { - cd $pkgbase-$_pkgver - rm -v sql/sql_yacc.{cc,h} - - sed 's/${fullhostname}/"archbuild"/' -i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake - sed 's/-Werror//g' -i \ - storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake \ - plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt - - patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch -} - -build() { - rm -rf build - mkdir build - cd build - - cmake ../$pkgbase-$_pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/perconaserver \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_ZLIB=system \ - -DWITH_LZ4=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_PAM=ON \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_EMBEDDED_SHARED_LIBRARY=ON \ - -DWITH_INNODB_MEMCACHED=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ - -DWITH_EXAMPLE_STORAGE_ENGINE=OFF \ - -DWITH_ROCKSDB=1 \ - -DWITH_SYSTEMD=1 \ - -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ - -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks -Wno-error=nonnull-compare -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-maybe-uninitialized" \ - -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \ - -DWITH_BOOST="../boost_${_boost_ver//./_}" \ - -DWITH_NUMA=ON - - make -} - -package_libperconaserverclient() { - pkgdesc='Percona Server client libraries' - depends=('zlib' 'openssl') - - cd build - for dir in include libmysql libmysqld libservices; do - make -C $dir DESTDIR="$pkgdir" install - done - - # Conflicting files with libmariadbclient - rm -rf "$pkgdir"/usr/lib/{libmysql*,mysql} - - install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config - install -d "$pkgdir"/usr/share/man/man1 - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 -} - -package_percona-server-clients() { - pkgdesc='Percona Server client tools' - depends=('libperconaserverclient' 'zlib' 'lz4' 'jemalloc' 'readline') - conflicts=('mysql-clients') - provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") - - cd build - make -C client DESTDIR="$pkgdir" install - - # install man pages - install -d "$pkgdir"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqlpump; do - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 - done - - # provided by percona-server - rm "$pkgdir"/usr/bin/mysql{_plugin,_upgrade,binlog,test,_config_editor,_install_db,_secure_installation,_ssl_rsa_setup} -} - -package_percona-server() { - pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine' - backup=('etc/mysql/my.cnf') - depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl') - optdepends=('perl-dbd-mysql') - conflicts=('mysql') - provides=("mysql=$_myver" "mariadb=$_myver") - options=('emptydirs') - - cd build - make DESTDIR="$pkgdir" install - - install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf - - cd "$pkgdir" - mv usr/usr/lib/* usr/lib - rm -rf usr/usr - - # Move documentation - install -dm755 usr/share/doc - mv usr/share/mysql/docs usr/share/doc/$pkgname - mv usr/share/mysql/{COPYING,README.MySQL} usr/share/doc/$pkgname/ - - if [ -f usr/PATENTS ]; then - mv usr/{PATENTS,README.md} usr/share/doc/$pkgname/ - rm usr/COPYING.* - fi - - # provided by libperconaserverclient - rm usr/bin/mysql_config - rm usr/lib/lib{mysql,perconaserver}* - rm -r usr/include/ - rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by percona-server-clients - rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump} - rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump}.1 - - # deprecated/unused - rm usr/bin/replace - rm usr/share/man/man1/replace.1 - - # not needed - rm -r usr/mysql-test - rm usr/share/man/man1/mysql-test-run.pl.1 -} Copied: percona-server/repos/community-x86_64/PKGBUILD (from rev 318946, percona-server/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-04 15:00:50 UTC (rev 318947) @@ -0,0 +1,179 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgbase=percona-server +pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') +pkgver=5.7.21_21 +_boost_ver=1.59.0 +_pkgver=${pkgver/_/-} +_myver=${pkgver/_rel*} +pkgrel=1 +arch=('x86_64') +makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto') +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" + "http://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz" + 'my.cnf' + 'mysql-user.conf' + 'rocksdb-systemlibs.patch' + 'mysql-tirpc.patch') +sha256sums=('8f9b3723741ad8f7b4d1d9366199aa3e7bb081b46130260c13fe9c14302d6b6b' + '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' + 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' + 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' + 'fcc3bea0982cda6cc35637d448a46924eccdfeb4c4da0634a26c9d190cf50fe4' + 'fa3e4b3e6fab751fe6857e994e72a1ba951b36d27c8a1e59a7263d3f60a13c28') + +prepare() { + cd $pkgbase-$_pkgver + rm -v sql/sql_yacc.{cc,h} + + sed 's/${fullhostname}/"archbuild"/' -i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake + sed 's/-Werror//g' -i \ + storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake \ + plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt + + patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch + patch -p1 -i "$srcdir"/mysql-tirpc.patch +} + +build() { + # rm -rf build + mkdir -p build + cd build + + cmake ../$pkgbase-$_pkgver \ + -DBUILD_CONFIG=mysql_release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_unicode_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/doc/percona-server \ + -DINSTALL_DOCREADMEDIR=share/doc/percona-server \ + -DINSTALL_DOCDIR=share/doc/percona-server \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/perconaserver \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DWITH_ZLIB=system \ + -DWITH_LZ4=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MECAB=OFF \ + -DWITH_PAM=ON \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_EMBEDDED_SHARED_LIBRARY=ON \ + -DWITH_INNODB_MEMCACHED=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_FEDERATED_STORAGE_ENGINE=ON \ + -DWITH_ROCKSDB=ON \ + -DTOKU_DEBUG_PARANOID=OFF \ + -DWITH_VALGRIND=OFF \ + -DUSE_VALGRIND=OFF \ + -DDEBUG_EXTNAME=OFF \ + -DBUILD_TESTING=OFF \ + -DWITH_UNIT_TESTS=OFF \ + -DUSE_GTAGS=OFF \ + -DUSE_CTAGS=OFF \ + -DUSE_ETAGS=OFF \ + -DUSE_CSCOPE=OFF \ + -DTOKUDB_BACKUP_PLUGIN_VERSION=$_pkgver \ + -DWITH_SYSTEMD=1 \ + -DWITH_SCALABILITY_METRICS=ON \ + -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ + -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks -Wno-dev" \ + -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks -Wno-dev -Wno-error=nonnull-compare -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-maybe-uninitialized" \ + -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \ + -DWITH_BOOST="../boost_${_boost_ver//./_}" \ + -DWITH_NUMA=ON + + make +} + +package_libperconaserverclient() { + pkgdesc='Percona Server client libraries' + depends=('zlib' 'openssl') + + cd build + for dir in include libmysql libmysqld libservices; do + make -C $dir DESTDIR="$pkgdir" install + done + + # Conflicting files with libmariadbclient + rm -rf "$pkgdir"/usr/lib/{libmysql*,mysql} + + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config + install -d "$pkgdir"/usr/share/man/man1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 +} + +package_percona-server-clients() { + pkgdesc='Percona Server client tools' + depends=('libperconaserverclient' 'zlib' 'lz4' 'jemalloc' 'readline') + conflicts=('mysql-clients') + provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") + + cd build + make -C client DESTDIR="$pkgdir" install + + # install man pages + install -d "$pkgdir"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqlpump; do + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + done + + # provided by percona-server + rm "$pkgdir"/usr/bin/mysql{_plugin,_upgrade,binlog,test,_config_editor,_install_db,_secure_installation,_ssl_rsa_setup} +} + +package_percona-server() { + pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine' + backup=('etc/mysql/my.cnf') + depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc') + optdepends=('perl-dbd-mysql') + conflicts=('mysql') + provides=("mysql=$_myver" "mariadb=$_myver") + options=('emptydirs') + + cd build + make DESTDIR="$pkgdir" install + + install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf + + cd "$pkgdir" + mv usr/usr/lib/* usr/lib + rm -rf usr/usr + + # Move documentation + if [ -f usr/PATENTS ]; then + mv usr/{PATENTS,README.md} usr/share/doc/$pkgname/ + rm usr/COPYING.* + fi + + # provided by libperconaserverclient + rm usr/bin/mysql_config + rm usr/lib/lib{mysql,perconaserver}* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by percona-server-clients + rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump} + rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump}.1 + + # deprecated/unused + rm usr/bin/replace + rm usr/share/man/man1/replace.1 + + # not needed + rm -r usr/mysql-test + rm usr/share/man/man1/mysql-test-run.pl.1 +} Deleted: my.cnf =================================================================== --- my.cnf 2018-05-04 15:00:31 UTC (rev 318946) +++ my.cnf 2018-05-04 15:00:50 UTC (rev 318947) @@ -1,38 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html - -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql - -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -[mysqld_safe] -log-error = /var/log/mysqld.log -pid-file = /run/mysqld/mysqld.pid Copied: percona-server/repos/community-x86_64/my.cnf (from rev 318946, percona-server/trunk/my.cnf) =================================================================== --- my.cnf (rev 0) +++ my.cnf 2018-05-04 15:00:50 UTC (rev 318947) @@ -0,0 +1,38 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html + +[client] +#password = your_password +port = 3306 +socket = /run/mysqld/mysqld.sock + +[mysqld] +port = 3306 +socket = /run/mysqld/mysqld.sock +datadir = /var/lib/mysql + +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M + +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +# Recommended in standard MySQL setup +sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +[mysqld_safe] +log-error = /var/log/mysqld.log +pid-file = /run/mysqld/mysqld.pid Copied: percona-server/repos/community-x86_64/mysql-tirpc.patch (from rev 318946, percona-server/trunk/mysql-tirpc.patch) =================================================================== --- mysql-tirpc.patch (rev 0) +++ mysql-tirpc.patch 2018-05-04 15:00:50 UTC (rev 318947) @@ -0,0 +1,62 @@ +diff --git a/rapid/plugin/group_replication/configure.cmake b/rapid/plugin/group_replication/configure.cmake +index 59a074bd..35c99dbf 100644 +--- a/rapid/plugin/group_replication/configure.cmake ++++ b/rapid/plugin/group_replication/configure.cmake +@@ -50,8 +50,16 @@ IF (WIN32) + ENDIF() + + IF (NOT WIN32) ++ # First look for tirpc, then the old Sun RPC ++ FIND_PATH(RPC_INCLUDE_DIR ++ NAMES rpc/rpc.h ++ HINTS /usr/include/tirpc ++ NO_DEFAULT_PATH ++ ) ++ FIND_PATH(RPC_INCLUDE_DIR NAMES rpc/rpc.h) + SET (CMAKE_REQUIRED_FLAGS_BACKUP ${CMAKE_REQUIRED_FLAGS}) + SET (CMAKE_REQUIRED_FLAGS "-Wno-error") ++ SET (CMAKE_REQUIRED_INCLUDES ${RPC_INCLUDE_DIR}) + ENDIF() + + # +diff --git a/rapid/plugin/group_replication/rpcgen.cmake b/rapid/plugin/group_replication/rpcgen.cmake +index b9c5895c..7856e046 100644 +--- a/rapid/plugin/group_replication/rpcgen.cmake ++++ b/rapid/plugin/group_replication/rpcgen.cmake +@@ -87,6 +87,23 @@ FOREACH(X xcom_vp) + ${XCOM_BASEDIR}/xcom_proto_enum.h + ${XCOM_BASEDIR}/xcom_limits.h) + ELSE() ++ FIND_PROGRAM(RPCGEN_EXECUTABLE rpcgen DOC "path to the rpcgen executable") ++ MARK_AS_ADVANCED(RPCGEN_EXECUTABLE) ++ IF(NOT RPCGEN_EXECUTABLE) ++ MESSAGE(FATAL_ERROR "Could not find rpcgen") ++ ENDIF() ++ ++ IF(NOT RPC_INCLUDE_DIR) ++ MESSAGE(FATAL_ERROR ++ "Could not find rpc/rpc.h in /usr/include or /usr/include/tirpc") ++ ENDIF() ++ MESSAGE(STATUS "RPC_INCLUDE_DIR ${RPC_INCLUDE_DIR}") ++ IF(RPC_INCLUDE_DIR STREQUAL "/usr/include/tirpc") ++ INCLUDE_DIRECTORIES(SYSTEM /usr/include/tirpc) ++ ADD_DEFINITIONS(-DHAVE_TIRPC) ++ SET(TIRPC_LIBRARY tirpc) ++ ENDIF() ++ + # on unix systems try to generate them if needed + ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c} ${x_tmp_plat_h} + COMMAND ${CMAKE_COMMAND} -E copy_if_different +@@ -103,10 +120,10 @@ FOREACH(X xcom_vp) + + # generate the sources + COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_h} +- COMMAND rpcgen -C -h -o ++ COMMAND ${RPCGEN_EXECUTABLE} -C -h -o + ${x_gen_h} ${x_tmp_x_canonical_name} + COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_c} +- COMMAND rpcgen -C -c -o ++ COMMAND ${RPCGEN_EXECUTABLE} -C -c -o + ${x_gen_c} ${x_tmp_x_canonical_name} + WORKING_DIRECTORY ${gen_xdr_dir} + DEPENDS Deleted: mysql-user.conf =================================================================== --- mysql-user.conf 2018-05-04 15:00:31 UTC (rev 318946) +++ mysql-user.conf 2018-05-04 15:00:50 UTC (rev 318947) @@ -1 +0,0 @@ -u mysql 89 "MySQL user" Copied: percona-server/repos/community-x86_64/mysql-user.conf (from rev 318946, percona-server/trunk/mysql-user.conf) =================================================================== --- mysql-user.conf (rev 0) +++ mysql-user.conf 2018-05-04 15:00:50 UTC (rev 318947) @@ -0,0 +1 @@ +u mysql 89 "MySQL user" Deleted: rocksdb-systemlibs.patch =================================================================== --- rocksdb-systemlibs.patch 2018-05-04 15:00:31 UTC (rev 318946) +++ rocksdb-systemlibs.patch 2018-05-04 15:00:50 UTC (rev 318947) @@ -1,52 +0,0 @@ -diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt -index 2a0a612..8424184 100644 ---- a/storage/rocksdb/CMakeLists.txt -+++ b/storage/rocksdb/CMakeLists.txt -@@ -114,38 +114,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 -@@ -177,7 +150,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/repos/community-x86_64/rocksdb-systemlibs.patch (from rev 318946, percona-server/trunk/rocksdb-systemlibs.patch) =================================================================== --- rocksdb-systemlibs.patch (rev 0) +++ rocksdb-systemlibs.patch 2018-05-04 15:00:50 UTC (rev 318947) @@ -0,0 +1,52 @@ +diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt +index 2a0a612..8424184 100644 +--- a/storage/rocksdb/CMakeLists.txt ++++ b/storage/rocksdb/CMakeLists.txt +@@ -114,38 +114,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 +@@ -177,7 +150,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}