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-galera/
Date: Sat, 10 Feb 2018 03:27:49
Message-Id: 1518233201.547c610317331a04ac15bb675ea39e10d6e0b461.grknight@gentoo
1 commit: 547c610317331a04ac15bb675ea39e10d6e0b461
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 10 03:26:41 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 10 03:26:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547c6103
7
8 dev-db/mariadb-galera: Version bump for 10.0.34
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-db/mariadb-galera/Manifest | 2 +
13 .../mariadb-galera/mariadb-galera-10.0.34.ebuild | 183 +++++++++++++++++++++
14 2 files changed, 185 insertions(+)
15
16 diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
17 index 6ba47c1c7be..af0a4ea7812 100644
18 --- a/dev-db/mariadb-galera/Manifest
19 +++ b/dev-db/mariadb-galera/Manifest
20 @@ -1,2 +1,4 @@
21 DIST mariadb-galera-10.0.32.tar.gz 63961466 BLAKE2B 98e98364e32cd6196b40c112f805d57b014d5cbb7d2d266f7730ba5a5f91e86f9c9902ac97e5ff1bfe3b421e3a0ced0204d24edc1ebdfd7fcf715255282ca836 SHA512 3f17c4baaa06a51e037c96bc9a44fb612d6e492f9212664a7b9b7a70be49e7657626cd10b89ec312d4062ddf44bbc1d2ca6b044269af0507669e86bdc683fabb
22 +DIST mariadb-galera-10.0.34.tar.gz 69661677 BLAKE2B a905e24c217843e04d35393af9eee06e2e42d6b6d4f7202645a795dd17ee60394b19228332dca9f0d078748f5d02893ad3f367c8c449147811abf78e502b7997 SHA512 e0226e6032d5ff0080a97ea486726a44d8e1b977b93c8d07b517be70098df4149d119d325ebcba6c6affa95a586c94ec8f99a5e5a74a7d2314311748029dc7ab
23 DIST mysql-extras-20160629-1442Z.tar.bz2 299152 BLAKE2B 171733eba8579b222b20ccabfc93aec666c60ea8498be3daec030e4217fde0e6112a2bcef48996c44817a6c6e8f7e9b255fe96e02553b042d3d9630a0a5a17ba SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715
24 +DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
25
26 diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild
27 new file mode 100644
28 index 00000000000..2279222e828
29 --- /dev/null
30 +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild
31 @@ -0,0 +1,183 @@
32 +# Copyright 1999-2018 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI="6"
36 +MY_EXTRAS_VER="20170926-1321Z"
37 +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
38 +WSREP_REVISION="25"
39 +SUBSLOT="18"
40 +MYSQL_PV_MAJOR="5.6"
41 +
42 +SERVER_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz"
43 +MY_SOURCEDIR="${PN%%-galera}-${PV}"
44 +JAVA_PKG_OPT_USE="jdbc"
45 +
46 +inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
47 +
48 +HOMEPAGE="http://mariadb.org/"
49 +DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
50 +
51 +IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml"
52 +RESTRICT="!bindist? ( bindist )"
53 +
54 +REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
55 +
56 +KEYWORDS="~amd64 ~x86"
57 +
58 +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
59 +PATCHES=(
60 + "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
61 + "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch"
62 + "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
63 + "${MY_PATCH_DIR}/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch"
64 +)
65 +COMMON_DEPEND="
66 + !bindist? ( >=sys-libs/readline-4.1:0= )
67 + server? (
68 + extraengine? (
69 + odbc? ( dev-db/unixODBC:0= )
70 + xml? ( dev-libs/libxml2:2= )
71 + )
72 + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
73 + pam? ( virtual/pam:0= )
74 + tokudb? ( app-arch/snappy )
75 + )
76 + >=dev-libs/libpcre-8.35:3=
77 +"
78 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
79 + server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
80 + ${COMMON_DEPEND}"
81 +RDEPEND="${RDEPEND} ${COMMON_DEPEND}
82 + sys-apps/iproute2
83 + =sys-cluster/galera-${WSREP_REVISION}*
84 + sst-rsync? ( sys-process/lsof )
85 + sst-xtrabackup? ( net-misc/socat[ssl] )
86 + perl? ( !dev-db/mytop
87 + virtual/perl-Getopt-Long
88 + dev-perl/TermReadKey
89 + virtual/perl-Term-ANSIColor
90 + virtual/perl-Time-HiRes )
91 + server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
92 +"
93 +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
94 +PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )"
95 +
96 +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
97 +
98 +pkg_setup() {
99 + java-pkg-opt-2_pkg_setup
100 + mysql-multilib-r1_pkg_setup
101 +}
102 +
103 +pkg_preinst() {
104 + java-pkg-opt-2_pkg_preinst
105 + mysql-multilib-r1_pkg_preinst
106 +}
107 +
108 +src_prepare() {
109 + java-pkg-opt-2_src_prepare
110 + mysql-multilib-r1_src_prepare
111 +}
112 +
113 +src_configure(){
114 + # bug 508724 mariadb cannot use ld.gold
115 + tc-ld-disable-gold
116 + local MYSQL_CMAKE_NATIVE_DEFINES=(
117 + -DWITH_JEMALLOC=$(usex jemalloc system)
118 + -DWITH_PCRE=system
119 + )
120 + if use server ; then
121 + # Federated{,X} must be treated special otherwise they will not be built as plugins
122 + if ! use extraengine ; then
123 + MYSQL_CMAKE_NATIVE_DEFINES+=(
124 + -DWITHOUT_FEDERATED=1
125 + -DWITHOUT_FEDERATEDX=1 )
126 + fi
127 +
128 + MYSQL_CMAKE_NATIVE_DEFINES+=(
129 + $(mysql-cmake_use_plugin oqgraph OQGRAPH)
130 + $(mysql-cmake_use_plugin sphinx SPHINX)
131 + $(mysql-cmake_use_plugin tokudb TOKUDB)
132 + $(mysql-cmake_use_plugin pam AUTH_PAM)
133 + -DWITHOUT_CASSANDRA=0
134 + $(mysql-cmake_use_plugin extraengine SEQUENCE)
135 + $(mysql-cmake_use_plugin extraengine SPIDER)
136 + $(mysql-cmake_use_plugin extraengine CONNECT)
137 + -DCONNECT_WITH_MYSQL=1
138 + -DCONNECT_WITH_LIBXML2=$(usex xml)
139 + -DCONNECT_WITH_ODBC=$(usex odbc)
140 + -DCONNECT_WITH_JDBC=$(usex jdbc)
141 + -DWITHOUT_MROONGA=1
142 + )
143 + fi
144 + mysql-multilib-r1_src_configure
145 +}
146 +
147 +# Official test instructions:
148 +# USE='extraengine perl server openssl static-libs' \
149 +# FEATURES='test userpriv -usersandbox' \
150 +# ebuild mariadb-X.X.XX.ebuild \
151 +# digest clean package
152 +multilib_src_test() {
153 +
154 + if ! multilib_is_native_abi ; then
155 + einfo "Server tests not available on non-native abi".
156 + return 0;
157 + fi
158 +
159 + local TESTDIR="${BUILD_DIR}/mysql-test"
160 + local retstatus_unit
161 + local retstatus_tests
162 +
163 + if ! use server ; then
164 + einfo "Skipping server tests due to minimal build."
165 + fi
166 +
167 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
168 + # localhost. Also causes weird failures.
169 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
170 +
171 + if [[ $UID -eq 0 ]]; then
172 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
173 + fi
174 + has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
175 +
176 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
177 +
178 + # Run CTest (test-units)
179 + cmake-utils_src_test
180 + retstatus_unit=$?
181 +
182 + # Ensure that parallel runs don't die
183 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
184 + # Enable parallel testing, auto will try to detect number of cores
185 + # You may set this by hand.
186 + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
187 + export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
188 +
189 + # create directories because mysqladmin might run out of order
190 + mkdir -p "${T}"/var-tests{,/log}
191 +
192 + # Run mysql tests
193 + pushd "${TESTDIR}" || die
194 +
195 + mysql-multilib-r1_disable_test galera.galera_defaults \
196 + "Test may vary by library defaults"
197 +
198 + # run mysql-test tests
199 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
200 + retstatus_tests=$?
201 +
202 + popd || die
203 +
204 + # Cleanup is important for these testcases.
205 + pkill -9 -f "${S}/ndb" 2>/dev/null
206 + pkill -9 -f "${S}/sql" 2>/dev/null
207 +
208 + local failures=""
209 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
210 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
211 +
212 + [[ -z "$failures" ]] || die "Test failures: $failures"
213 + einfo "Tests successfully completed"
214 +}