Update to 10.3.8

2 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c99f60c78d0..fedef6a4e7e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Wed Jun 27 21:50:48 UTC 2018
+# Wed Jul  4 08:42:59 UTC 2018
 pkgbase = mariadb-mainline-noconflict
-	pkgver = 10.3.7
+	pkgver = 10.3.8
 	pkgrel = 1
 	url = http://mariadb.org/
 	arch = x86_64
@@ -16,15 +16,16 @@ pkgbase = mariadb-mainline-noconflict
 	makedepends = boost
 	makedepends = libevent
 	makedepends = systemd
-	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.7/source/mariadb-10.3.7.tar.gz
-	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.7/source/mariadb-10.3.7.tar.gz.asc
-	sha256sums = e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf
+	makedepends = coreutils
+	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.8/source/mariadb-10.3.8.tar.gz
+	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.8/source/mariadb-10.3.8.tar.gz.asc
+	sha256sums = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8
 	sha256sums = SKIP
 
 pkgname = mariadb-mainline-noconflict
 	pkgdesc = Fast SQL database server, drop-in replacement for MySQL
 	install = mariadb.install
-	depends = mariadb-clients-mainline-noconflict=10.3.7
+	depends = mariadb-clients-mainline-noconflict=10.3.8
 	depends = inetutils
 	depends = libaio
 	depends = libxml2
@@ -36,8 +37,8 @@ pkgname = mariadb-mainline-noconflict
 	depends = libsystemd
 	optdepends = galera: for MariaDB cluster with Galera WSREP
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission
-	provides = mysql=10.3.7
-	provides = mariadb=10.3.7
+	provides = mysql=10.3.8
+	provides = mariadb=10.3.8
 	conflicts = mysql
 	conflicts = mariadb
 	options = emptydirs
@@ -52,19 +53,19 @@ pkgname = libmariadbclient-mainline-noconflict
 	depends = lz4
 	depends = lzo
 	depends = xz
-	provides = libmysqlclient=10.3.7
-	provides = libmariadbclient=10.3.7
+	provides = libmysqlclient=10.3.8
+	provides = libmariadbclient=10.3.8
 	conflicts = libmysqlclient
 	conflicts = libmariadbclient
 
 pkgname = mariadb-clients-mainline-noconflict
 	pkgdesc = MariaDB client tools
-	depends = libmariadbclient-mainline-noconflict=10.3.7
+	depends = libmariadbclient-mainline-noconflict=10.3.8
 	depends = zlib
 	depends = openssl
 	depends = jemalloc
-	provides = mysql-clients=10.3.7
-	provides = mariadb-clients=10.3.7
+	provides = mysql-clients=10.3.8
+	provides = mariadb-clients=10.3.8
 	conflicts = mysql-clients
 	conflicts = mariadb-clients
 
@@ -73,6 +74,6 @@ pkgname = mytop-mainline-noconflict
 	depends = perl
 	depends = perl-dbd-mysql
 	depends = perl-term-readkey
-	provides = mytop=10.3.7
+	provides = mytop=10.3.8
 	conflicts = mytop
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d2a8e7355c0..64b1c45a48e0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,16 @@
 pkgbase=mariadb-mainline-noconflict
 _pkgbase=mariadb
 pkgname=('mariadb-mainline-noconflict' 'libmariadbclient-mainline-noconflict' 'mariadb-clients-mainline-noconflict' 'mytop-mainline-noconflict')
-pkgver=10.3.7
+pkgver=10.3.8
 pkgrel=1
 pkgdesk="MariaDB mainline version with libmysqlclient.so.18 (mariadb 10.1 compatible)"
 arch=('x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'openssl' 'jemalloc' 'lz4' 'boost' 'libevent' 'systemd')
+makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'openssl' 'jemalloc' 'lz4' 'boost' 'libevent' 'systemd' 'coreutils')
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
 source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc})
-sha256sums=('e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf'
+sha256sums=('30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8'
             'SKIP')
 
 prepare() {
@@ -26,6 +26,7 @@ prepare() {
     -e '/^PrivateTmp/c PrivateTmp=true' \
     support-files/mariadb{,@}.service.in
 
+    
   # let's create the datadir from tmpfiles
   echo 'd @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -' >> support-files/tmpfiles.conf.in
 }
@@ -77,10 +78,10 @@ build() {
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
     -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
     -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-rtti -fno-delete-null-pointer-checks" \
+    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks -std=c++0x" \
     -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
 
-  make
+  make -j$(nproc)
 }
 
 package_libmariadbclient-mainline-noconflict() {