1 |
commit: 1af23fea03c78989db82b9cdfb525dde1c030f15 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 18:27:34 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 18:38:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af23fea |
7 |
|
8 |
dev-db/mariadb: Version bump to 10.1.17 |
9 |
|
10 |
Clean up tests |
11 |
Add in jdbc for connect engine |
12 |
Allow both versions of percona xtrabackup to satisfy the sst-xtrabackup |
13 |
|
14 |
Package-Manager: portage-2.3.0 |
15 |
|
16 |
dev-db/mariadb/Manifest | 1 + |
17 |
dev-db/mariadb/mariadb-10.1.17.ebuild | 207 ++++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 208 insertions(+) |
19 |
|
20 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
21 |
index 88c076e..2a3ebff 100644 |
22 |
--- a/dev-db/mariadb/Manifest |
23 |
+++ b/dev-db/mariadb/Manifest |
24 |
@@ -5,6 +5,7 @@ DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d4161 |
25 |
DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d |
26 |
DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a |
27 |
DIST mariadb-10.1.16.tar.gz 55527069 SHA256 67cb35c62cc5d4cf48d7b614c0c7a9245a762ca23d4e588e15c616c102e64393 SHA512 4bf9a0b9c964f2526ecb48a0b7863c39a43ca3a6d3685b6397f79a4004d0f065108ea2367116d53da42dd70e42a4b4761bf4ead79c0483e0ba65915f58a6dd73 WHIRLPOOL f881982cf04018c875f5128a5e9a94fc368d4eaedd2bf2cff03118cf79bbeab69a90eed7ee8f6d02953fecff9ac8d750836eded4a5df18077d48fe0f3298aee2 |
28 |
+DIST mariadb-10.1.17.tar.gz 61158134 SHA256 4ca45ac5e34418761868115ebc8c068d511fed08e283b2cac52559d63ba4aab5 SHA512 900f019ec7544e315c98aea3647988f6ec257822b116c8a986851db678dd0bf71018dde1d0c90adeaa713af12348344ffc54c292a64869d9565f3f906599396d WHIRLPOOL e2e4d1294bc64c37d6916dc291d33769fd05c591697efba27fff79cb4debc76cf7a5eaf6e63a9ce3a12c22653ffc9d25082eb5a03f4f402b7395b91cb9ea415d |
29 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
30 |
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3 |
31 |
DIST mariadb-5.5.50.tar.gz 45731073 SHA256 030b60a787333bf20ec0ee02b02da52474772c069954dc914f894a7703989b76 SHA512 b20f0aefa3e9ff9ef94151a03ba9c6dc43d6993ee27356d5ead9c076554ed7196c9dca35d3a8547e395b094bfb121baa21d05da5fa343fb2b76c738d1276f72f WHIRLPOOL c8e7b539a51250216b3bd9c65a805675827a2660c8a24f79fdbae8557a2b4f72ba03fda4d8b9b3e996a25b4e8e8fe031e8a21f5c13ef5512a31bf13647746735 |
32 |
|
33 |
diff --git a/dev-db/mariadb/mariadb-10.1.17.ebuild b/dev-db/mariadb/mariadb-10.1.17.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000..cd8d8ef |
36 |
--- /dev/null |
37 |
+++ b/dev-db/mariadb/mariadb-10.1.17.ebuild |
38 |
@@ -0,0 +1,207 @@ |
39 |
+# Copyright 1999-2016 Gentoo Foundation |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+# $Id$ |
42 |
+ |
43 |
+EAPI="6" |
44 |
+MY_EXTRAS_VER="20160721-1526Z" |
45 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
46 |
+WSREP_REVISION="25" |
47 |
+SUBSLOT="18" |
48 |
+MYSQL_PV_MAJOR="5.6" |
49 |
+ |
50 |
+JAVA_PKG_OPT_USE="jdbc" |
51 |
+ |
52 |
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
53 |
+ |
54 |
+HOMEPAGE="http://mariadb.org/" |
55 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
56 |
+ |
57 |
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
58 |
+RESTRICT="!bindist? ( bindist )" |
59 |
+ |
60 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
61 |
+ |
62 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
63 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
64 |
+ |
65 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
66 |
+ |
67 |
+PATCHES=( |
68 |
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
69 |
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
70 |
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
71 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
72 |
+) |
73 |
+ |
74 |
+COMMON_DEPEND=" |
75 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
76 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
77 |
+ systemd? ( sys-apps/systemd:= ) |
78 |
+ !bindist? ( |
79 |
+ sys-libs/binutils-libs:0= |
80 |
+ >=sys-libs/readline-4.1:0= |
81 |
+ ) |
82 |
+ server? ( |
83 |
+ cracklib? ( sys-libs/cracklib:0= ) |
84 |
+ extraengine? ( |
85 |
+ odbc? ( dev-db/unixODBC:0= ) |
86 |
+ xml? ( dev-libs/libxml2:2= ) |
87 |
+ ) |
88 |
+ innodb-lz4? ( app-arch/lz4 ) |
89 |
+ innodb-lzo? ( dev-libs/lzo ) |
90 |
+ innodb-snappy? ( app-arch/snappy ) |
91 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
92 |
+ pam? ( virtual/pam:0= ) |
93 |
+ tokudb? ( app-arch/snappy ) |
94 |
+ ) |
95 |
+ >=dev-libs/libpcre-8.35:3= |
96 |
+" |
97 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
98 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
99 |
+ ${COMMON_DEPEND}" |
100 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
101 |
+ galera? ( |
102 |
+ sys-apps/iproute2 |
103 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
104 |
+ sst-rsync? ( sys-process/lsof ) |
105 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
106 |
+ ) |
107 |
+ perl? ( !dev-db/mytop |
108 |
+ virtual/perl-Getopt-Long |
109 |
+ dev-perl/TermReadKey |
110 |
+ virtual/perl-Term-ANSIColor |
111 |
+ virtual/perl-Time-HiRes ) |
112 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
113 |
+" |
114 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
115 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
116 |
+ |
117 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
118 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
119 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
120 |
+ |
121 |
+pkg_setup() { |
122 |
+ java-pkg-opt-2_pkg_setup |
123 |
+ mysql-multilib-r1_pkg_setup |
124 |
+} |
125 |
+ |
126 |
+pkg_preinst() { |
127 |
+ java-pkg-opt-2_pkg_preinst |
128 |
+ mysql-multilib-r1_pkg_preinst |
129 |
+} |
130 |
+ |
131 |
+src_prepare() { |
132 |
+ java-pkg-opt-2_src_prepare |
133 |
+ mysql-multilib-r1_src_prepare |
134 |
+} |
135 |
+ |
136 |
+src_configure(){ |
137 |
+ # bug 508724 mariadb cannot use ld.gold |
138 |
+ tc-ld-disable-gold |
139 |
+ |
140 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
141 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
142 |
+ -DWITH_PCRE=system |
143 |
+ ) |
144 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
145 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
146 |
+ ) |
147 |
+ if use server ; then |
148 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
149 |
+ if ! use extraengine ; then |
150 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
151 |
+ -DPLUGIN_FEDERATED=NO |
152 |
+ -DPLUGIN_FEDERATEDX=NO ) |
153 |
+ fi |
154 |
+ |
155 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
156 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
157 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
158 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
159 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
160 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
161 |
+ -DPLUGIN_CASSANDRA=NO |
162 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
163 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
164 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
165 |
+ -DCONNECT_WITH_MYSQL=1 |
166 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
167 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
168 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
169 |
+ -DWITH_WSREP=$(usex galera) |
170 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
171 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo) |
172 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
173 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
174 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
175 |
+ ) |
176 |
+ fi |
177 |
+ mysql-multilib-r1_src_configure |
178 |
+} |
179 |
+ |
180 |
+# Official test instructions: |
181 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
182 |
+# FEATURES='test userpriv -usersandbox' \ |
183 |
+# ebuild mariadb-X.X.XX.ebuild \ |
184 |
+# digest clean package |
185 |
+multilib_src_test() { |
186 |
+ |
187 |
+ if ! multilib_is_native_abi ; then |
188 |
+ einfo "Server tests not available on non-native abi". |
189 |
+ return 0; |
190 |
+ fi |
191 |
+ |
192 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
193 |
+ local retstatus_unit |
194 |
+ local retstatus_tests |
195 |
+ |
196 |
+ if use server ; then |
197 |
+ einfo "Skipping server tests due to minimal build." |
198 |
+ return 0 |
199 |
+ fi |
200 |
+ |
201 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
202 |
+ # localhost. Also causes weird failures. |
203 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
204 |
+ |
205 |
+ if [[ $UID -eq 0 ]]; then |
206 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
207 |
+ fi |
208 |
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
209 |
+ |
210 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
211 |
+ |
212 |
+ # Run CTest (test-units) |
213 |
+ cmake-utils_src_test |
214 |
+ retstatus_unit=$? |
215 |
+ |
216 |
+ # Ensure that parallel runs don't die |
217 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
218 |
+ # Enable parallel testing, auto will try to detect number of cores |
219 |
+ # You may set this by hand. |
220 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
221 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
222 |
+ |
223 |
+ # create directories because mysqladmin might run out of order |
224 |
+ mkdir -p "${T}"/var-tests{,/log} |
225 |
+ |
226 |
+ # Run mysql tests |
227 |
+ pushd "${TESTDIR}" || die |
228 |
+ |
229 |
+ # run mysql-test tests |
230 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
231 |
+ retstatus_tests=$? |
232 |
+ |
233 |
+ popd || die |
234 |
+ |
235 |
+ # Cleanup is important for these testcases. |
236 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
237 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
238 |
+ |
239 |
+ local failures="" |
240 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
241 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
242 |
+ |
243 |
+ [[ -z "$failures" ]] || eerror "Test failures: $failures" |
244 |
+ einfo "Tests successfully completed" |
245 |
+} |