[arch-commits] Commit in percona-server/trunk (PKGBUILD rocksdb-systemlibs.patch)

[Massimiliano Torromeo]

    Date: Sunday, August 25, 2019 @ 10:54:32
  Author: mtorromeo
Revision: 501672

upgpkg: percona-server 8.0.16_7-1

Modified:
  percona-server/trunk/PKGBUILD
  percona-server/trunk/rocksdb-systemlibs.patch

--------------------------+
 PKGBUILD                 |   18 +++++++++---------
 rocksdb-systemlibs.patch |    6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-25 10:20:45 UTC (rev 501671)
+++ PKGBUILD	2019-08-25 10:54:32 UTC (rev 501672)
@@ -2,29 +2,28 @@
 
 pkgbase=percona-server
 pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=8.0.15_6
-_boost_ver=1.68.0
+pkgver=8.0.16_7
+#_boost_ver=1.69.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')
+makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost')
 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://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz"
+#        "https://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz"
         'my.cnf'
         'mysql-user.conf'
         'build-hostname.patch'
         'no-werror.patch'
         'rocksdb-systemlibs.patch')
-sha256sums=('25d946763aabc51bd18a547fba6be109ad083700318844e80675ae567057358b'
-            'da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf'
+sha256sums=('8f8f685c23917054f47b7b3a0f0acb6eb9157e59f46463caf112d1704495e798'
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
             '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
             'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70'
-            '38f1acce8d8eff8167f1defcd4ce7063e67beeb7ab67bbf15ba5630290d00b71')
+            '1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd')
 
 prepare() {
 	cd $pkgbase-$_pkgver
@@ -88,8 +87,9 @@
 		-DWITH_SYSTEMD=1 \
 		-DWITH_SCALABILITY_METRICS=ON \
 		-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
-		-DWITH_BOOST="../boost_${_boost_ver//./_}" \
+		-DWITH_BOOST=system \
 		-DWITH_NUMA=ON
+		# -DWITH_BOOST="../boost_${_boost_ver//./_}" \
 
 	make
 }
@@ -135,7 +135,7 @@
 package_percona-server() {
 	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine'
 	backup=('etc/mysql/my.cnf')
-	depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl')
+	depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl' 'boost-libs')
 	optdepends=('perl-dbd-mysql')
 	conflicts=('mysql')
 	provides=("mysql=$_myver" "mariadb=$_myver")

Modified: rocksdb-systemlibs.patch
===================================================================
--- rocksdb-systemlibs.patch	2019-08-25 10:20:45 UTC (rev 501671)
+++ rocksdb-systemlibs.patch	2019-08-25 10:54:32 UTC (rev 501672)
@@ -1,5 +1,5 @@
 diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
-index 8e9086d..ccd7416 100644
+index b8b698d..cef5336 100644
 --- a/storage/rocksdb/CMakeLists.txt
 +++ b/storage/rocksdb/CMakeLists.txt
 @@ -116,38 +116,11 @@ EXECUTE_PROCESS(
@@ -45,8 +45,8 @@
    ${ROCKSDB_LIB_SOURCES}
  )
  
--SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex "-lrt")
-+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex "-lrt -llz4 -lzstd")
+-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}