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

[Massimiliano Torromeo]

    Date: Saturday, July 25, 2020 @ 13:46:54
  Author: mtorromeo
Revision: 665269

upgpkg: percona-server 8.0.20_11-1

Modified:
  percona-server/trunk/PKGBUILD
  percona-server/trunk/no-werror.patch

-----------------+
 PKGBUILD        |   19 +++++++------------
 no-werror.patch |   10 +++++-----
 2 files changed, 12 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-25 13:03:06 UTC (rev 665268)
+++ PKGBUILD	2020-07-25 13:46:54 UTC (rev 665269)
@@ -2,7 +2,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*}
@@ -17,15 +17,13 @@
         'mysql-user.conf'
         'build-hostname.patch'
         'no-werror.patch'
-        'rocksdb-systemlibs.patch'
         'rocksdb-make.patch')
-sha256sums=('b819d81b9cdef497dd5fd1044ddb033d222b986cf610cb5d4bb1fa5010dba580'
+sha256sums=('929a1660f584bb3be49c579c1a2edd2a6a839c37fc4b275b843e90fba5cc77c0'
             '882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9'
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
             '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
-            'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70'
-            '1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd'
+            '2343a191c452b91caa458b03b0c1ef3f5afb0e7031816c68467af5c6a6ffe253'
             '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03')
 
 prepare() {
@@ -34,7 +32,6 @@
 
 	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
@@ -64,7 +61,6 @@
 		-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 \
@@ -71,12 +67,12 @@
 		-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 \
@@ -94,7 +90,6 @@
 		-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=ON \
@@ -113,7 +108,7 @@
 	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
@@ -169,7 +164,7 @@
 
 	# 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

Modified: no-werror.patch
===================================================================
--- no-werror.patch	2020-07-25 13:03:06 UTC (rev 665268)
+++ no-werror.patch	2020-07-25 13:46:54 UTC (rev 665269)
@@ -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 @@
  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