[arch-commits] Commit in percona-server/trunk (4 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Mon Dec 31 14:49:40 UTC 2018 

    Date: Monday, December 31, 2018 @ 14:49:40
  Author: mtorromeo
Revision: 420026

upgpkg: percona-server 8.0.13_3-1

Added:
  percona-server/trunk/build-hostname.patch
  percona-server/trunk/no-werror.patch
Modified:
  percona-server/trunk/PKGBUILD
  percona-server/trunk/rocksdb-systemlibs.patch

--------------------------+
 PKGBUILD                 |   40 +++++++++++++++++++---------------------
 build-hostname.patch     |   17 +++++++++++++++++
 no-werror.patch          |   28 ++++++++++++++++++++++++++++
 rocksdb-systemlibs.patch |   10 +++++-----
 4 files changed, 69 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-31 14:44:41 UTC (rev 420025)
+++ PKGBUILD	2018-12-31 14:49:40 UTC (rev 420026)
@@ -2,8 +2,8 @@
 
 pkgbase=percona-server
 pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=5.7.24_27
-_boost_ver=1.59.0
+pkgver=8.0.13_3
+_boost_ver=1.67.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
 pkgrel=1
@@ -15,23 +15,24 @@
         "http://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=('999593afa241660bc7860264b46a826faf97d80d411966fade24084f47b249a0'
-            '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
+sha256sums=('ab00626775b85ea506c1d992d66acee50f0bfbde54b830731f61652e87ff93da'
+            '8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665'
             'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
             'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
-            'fcc3bea0982cda6cc35637d448a46924eccdfeb4c4da0634a26c9d190cf50fe4')
+            '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
+            'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70'
+            '38f1acce8d8eff8167f1defcd4ce7063e67beeb7ab67bbf15ba5630290d00b71')
 
 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"/build-hostname.patch
+	patch -p1 -i "$srcdir"/no-werror.patch
+	# patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
 }
 
 build() {
@@ -41,6 +42,7 @@
 
 	cmake ../$pkgbase-$_pkgver \
 		-DBUILD_CONFIG=mysql_release \
+		-DREPRODUCIBLE_BUILD=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_DATADIR=/var/lib/mysql \
@@ -99,7 +101,7 @@
 	depends=('zlib' 'openssl')
 
 	cd build
-	for dir in include libmysql libmysqld libservices; do
+	for dir in include libmysql libservices; do
 		make -C $dir DESTDIR="$pkgdir" install
 	done
 
@@ -124,16 +126,16 @@
 
 	# install man pages
 	install -d "$pkgdir"/usr/share/man/man1
-	for man in mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,_upgrade}; do
+	for man in mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}; 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{_config_editor,_install_db,_secure_installation,_ssl_rsa_setup}
+	rm "$pkgdir"/usr/bin/mysql{_config_editor,_secure_installation,_ssl_rsa_setup}
 }
 
 package_percona-server() {
-	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine'
+	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')
 	optdepends=('perl-dbd-mysql')
@@ -165,13 +167,9 @@
 	rm -r usr/share/aclocal usr/lib/pkgconfig
 
 	# provided by percona-server-clients
-	rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,test,_upgrade}
-	rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,_upgrade}.1
+	rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade}
+	rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1
 
-	# deprecated/unused
-	rm usr/bin/replace
-	rm usr/share/man/man1/replace.1
-
 	# not needed
 	rm -r usr/mysql-test
 }

Added: build-hostname.patch
===================================================================
--- build-hostname.patch	                        (rev 0)
+++ build-hostname.patch	2018-12-31 14:49:40 UTC (rev 420026)
@@ -0,0 +1,17 @@
+diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake
+index 5b6882cc..d165f3e7 100644
+--- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake
++++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake
+@@ -56,11 +56,7 @@ endmacro(whoami)
+ 
+ ## gives the current hostname, minus .tokutek.com if it's there
+ macro(hostname out)
+-  execute_process(
+-    COMMAND hostname
+-    OUTPUT_VARIABLE fullhostname
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  string(REGEX REPLACE "\\.tokutek\\.com$" "" ${out} "${fullhostname}")
++  set(${out} "archbuild")
+ endmacro(hostname)
+ 
+ ## gather machine info

Added: no-werror.patch
===================================================================
--- no-werror.patch	                        (rev 0)
+++ no-werror.patch	2018-12-31 14:49:40 UTC (rev 420026)
@@ -0,0 +1,28 @@
+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
+--- 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
+   _LARGEFILE64_SOURCE)
+ 
+-set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
++set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
+ 
+ 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
+--- 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)
+ endif ()
+ 
+ ## always want these
+-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
+-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
+ 
+ # pick language dialect
+ set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")

Modified: rocksdb-systemlibs.patch
===================================================================
--- rocksdb-systemlibs.patch	2018-12-31 14:44:41 UTC (rev 420025)
+++ rocksdb-systemlibs.patch	2018-12-31 14:49:40 UTC (rev 420026)
@@ -1,8 +1,8 @@
 diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
-index 2a0a612..8424184 100644
+index 8e9086d..ccd7416 100644
 --- a/storage/rocksdb/CMakeLists.txt
 +++ b/storage/rocksdb/CMakeLists.txt
-@@ -114,38 +114,11 @@ EXECUTE_PROCESS(
+@@ -116,38 +116,11 @@ EXECUTE_PROCESS(
  # split the list into lines
  STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
  
@@ -41,12 +41,12 @@
  )
  
  ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
-@@ -177,7 +150,7 @@ SET(ROCKSDB_SOURCES
+@@ -184,7 +157,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")
+-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex "-lrt")
++SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex "-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