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

[Massimiliano Torromeo]

    Date: Friday, May 20, 2016 @ 15:55:38
  Author: mtorromeo
Revision: 175892

upgpkg: percona-server 5.7.11_4-4

Rebuilt with numa support

Added:
  percona-server/trunk/make_pair.patch
Modified:
  percona-server/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   21 ++++++++++++++-------
 make_pair.patch |   25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-20 13:50:37 UTC (rev 175891)
+++ PKGBUILD	2016-05-20 13:55:38 UTC (rev 175892)
@@ -7,14 +7,15 @@
 _boost_ver=1.59.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 # valgrind necessary for bug https://bugs.launchpad.net/percona-server/+bug/1494283
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind' 'pam')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind' 'pam' 'numactl' 'jemalloc')
 license=('GPL' 'AGPL')
 url="http://www.percona.com/software/percona-server/"
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
         "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz"
+        'make_pair.patch'
         'my.cnf'
         'mysql-user.conf')
 
@@ -22,6 +23,8 @@
 	cd $pkgbase-$_pkgver
 	rm -v sql/sql_yacc.{cc,h}
 
+	patch -p1 -i "$srcdir"/make_pair.patch
+
 	sed 's|${fullhostname}|"archbuild"|' \
 		-i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake
 }
@@ -54,6 +57,8 @@
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=system \
 		-DWITH_LIBWRAP=OFF \
+    -DWITH_JEMALLOC=ON \
+    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
 		-DWITH_UNIT_TESTS=OFF \
 		-DWITH_PAM=ON \
 		-DWITH_EXTRA_CHARSETS=complex \
@@ -69,9 +74,10 @@
 		-DWITH_EXAMPLE_STORAGE_ENGINE=OFF \
 	  -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" \
+		-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_BOOST="../boost_${_boost_ver//./_}" \
+		-DWITH_NUMA=ON
 
 	make
 }
@@ -78,7 +84,7 @@
 
 package_libperconaserverclient() {
 	pkgdesc='Percona Server client libraries'
-	depends=('openssl' 'libaio')
+	depends=('openssl' 'zlib')
 
 	cd build
 	for dir in include libmysql libmysqld libservices; do
@@ -95,7 +101,7 @@
 
 package_percona-server-clients() {
 	pkgdesc='Percona Server client tools'
-	depends=('libperconaserverclient' 'zlib' 'openssl')
+	depends=('libperconaserverclient' 'zlib' 'openssl' 'jemalloc')
 	conflicts=('mysql-clients')
 	provides=("mysql-clients=$_myver" "mariadb-clients=$_myver")
 
@@ -116,7 +122,7 @@
 	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine'
 	backup=('etc/mysql/my.cnf')
 	install=percona.install
-	depends=('libaio' 'systemd-tools' 'pam')
+	depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl')
 	optdepends=('perl-dbd-mysql')
 	conflicts=('mysql')
 	provides=("mysql=$_myver" "mariadb=$_myver")
@@ -163,5 +169,6 @@
 
 sha256sums=('3634d2262e646db11b03837561acb0e084f33e5a597957506cf4c333ea811921'
             '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
+            '1db0f48f06545307898bfed9305e5b4c2997ee97375cd8d0b2a36ee93370d00f'
             'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
             'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e')

Added: make_pair.patch
===================================================================
--- make_pair.patch	                        (rev 0)
+++ make_pair.patch	2016-05-20 13:55:38 UTC (rev 175892)
@@ -0,0 +1,25 @@
+From 34ec0d65ede8392ba3e0f114d72672b3f517f964 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 May 2016 01:09:34 +0200
+Subject: [PATCH] do not pass type to std::make_pair()
+
+We not pass type template arguments to std::make_pair()
+explicitly, and let the compiler deduce them on its own.
+This fixes compiler error on GCC 6.1.1.
+---
+ client/auth_utils.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/auth_utils.cc b/client/auth_utils.cc
+index 21416bb..03fd71c 100644
+--- a/client/auth_utils.cc
++++ b/client/auth_utils.cc
+@@ -61,7 +61,7 @@ int parse_cnf_file(istream &sin, map<string, string > *options,
+     getline(sin, option_value);
+     trim(&option_value);
+     if (option_name.length() > 0)
+-      options->insert(make_pair<string, string >(option_name, option_value));
++      options->insert(make_pair(option_name, option_value));
+   }
+   return ALL_OK;
+   } catch(...)