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