Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Fri, 09 Feb 2018 21:52:04
Message-Id: 1518213107.df9d1cdb0344cdb1af068aadee25a0c65c5b6d3d.grknight@gentoo
1 commit: df9d1cdb0344cdb1af068aadee25a0c65c5b6d3d
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 9 21:51:47 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 9 21:51:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9d1cdb
7
8 dev-db/mariadb: Backport NUMA enabling changes from 10.2 to 10.1.31
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-db/mariadb/Manifest | 1 +
13 dev-db/mariadb/mariadb-10.1.31.ebuild | 7 +++++--
14 2 files changed, 6 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
17 index 440bc168c01..543b842b461 100644
18 --- a/dev-db/mariadb/Manifest
19 +++ b/dev-db/mariadb/Manifest
20 @@ -17,3 +17,4 @@ DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a
21 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c
22 DIST mysql-extras-20170830-1210Z.tar.bz2 312079 BLAKE2B 821451c88ee812d6debed56f62102824370568999d16a469830c3ed84e9eb1aec7f823c8a422db60c9a74d20f19581178fc06ee0a483a6ea31ef408a882a8db6 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8
23 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
24 +DIST mysql-extras-20180209-2142Z.tar.bz2 315130 BLAKE2B 4e3b1de9fdbb455f318962dabb4867e1f987fc5e921c9184171d0cca2176306c0153b17d600db809d5f25405edd52079873071ff5fda94fe1ea6f840c575f87e SHA512 d750020428bfff81a4275d92bb19a22804e6f4a3f60153d1fc8a31df40491f4b52d534c6123d2862737443e91d4b76741c7ec8c2aaac17eba481301243718107
25
26 diff --git a/dev-db/mariadb/mariadb-10.1.31.ebuild b/dev-db/mariadb/mariadb-10.1.31.ebuild
27 index b191b1e8769..70cf9d93025 100644
28 --- a/dev-db/mariadb/mariadb-10.1.31.ebuild
29 +++ b/dev-db/mariadb/mariadb-10.1.31.ebuild
30 @@ -2,7 +2,7 @@
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI="6"
34 -MY_EXTRAS_VER="20170926-1321Z"
35 +MY_EXTRAS_VER="20180209-2142Z"
36 # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
37 WSREP_REVISION="25"
38 SUBSLOT="18"
39 @@ -15,7 +15,7 @@ inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
40 HOMEPAGE="http://mariadb.org/"
41 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
42
43 -IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml"
44 +IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml"
45 RESTRICT="!bindist? ( bindist )"
46
47 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
48 @@ -31,6 +31,7 @@ PATCHES=(
49 "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
50 "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
51 "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
52 + "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch
53 )
54
55 COMMON_DEPEND="
56 @@ -51,6 +52,7 @@ COMMON_DEPEND="
57 innodb-lz4? ( app-arch/lz4 )
58 innodb-lzo? ( dev-libs/lzo )
59 innodb-snappy? ( app-arch/snappy )
60 + numa? ( sys-process/numactl )
61 oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
62 pam? ( virtual/pam:0= )
63 systemd? ( sys-apps/systemd:= )
64 @@ -141,6 +143,7 @@ src_configure(){
65 -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
66 -DWITH_MARIABACKUP=$(usex backup ON OFF)
67 -DWITH_LIBARCHIVE=$(usex backup ON OFF)
68 + -DWITH_NUMA=$(usex numa ON OFF)
69 )
70 fi
71 mysql-multilib-r1_src_configure