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