1 |
commit: 02b5792147ed6252828d30762ac91212148202e2 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 31 01:00:47 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 01:00:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b57921 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.0.33 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.0.33.ebuild | 209 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 210 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index 9b677599700..5433725ba0d 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -1,5 +1,6 @@ |
21 |
DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37 |
22 |
DIST mariadb-10.0.32.tar.gz 63567828 SHA256 f7a8d9ba88b01d426f5d69e5044e505e444a5ce73e22c9c50913dade43725936 SHA512 e1ecfc2b819b5ffa72fc0d4131fc9d7b6811919e10f15608830611028746580731c653a6b3eb43c92640cd29716b6278f48d27af5322dd2084f2d5f356e6f628 WHIRLPOOL e39e115d1382dbce432c2e27f85b03c8079dec03fd84fc3a0e1f906cb8ef2f82e2eab719fe2544de2ba8a83c66858d276ca2224e66317ecd7ade2d7a78d00368 |
23 |
+DIST mariadb-10.0.33.tar.gz 69211872 SHA256 e3e3d583c51761aee2fcd0e51bfa7d592c1299cf5eb977e61ea9dc72932e8870 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104 WHIRLPOOL 9ef2a9f521b83643a6460a338e6972143af087d4b243cba89ccb92fbd35b738d028092ce697b13c3d4e591391e03035c95ecba0bd55227960c8644b0e4a57bb9 |
24 |
DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122 |
25 |
DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21 |
26 |
DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67 |
27 |
|
28 |
diff --git a/dev-db/mariadb/mariadb-10.0.33.ebuild b/dev-db/mariadb/mariadb-10.0.33.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..f57d792314e |
31 |
--- /dev/null |
32 |
+++ b/dev-db/mariadb/mariadb-10.0.33.ebuild |
33 |
@@ -0,0 +1,209 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+MY_EXTRAS_VER="20170926-1321Z" |
39 |
+SUBSLOT="18" |
40 |
+MYSQL_PV_MAJOR="5.6" |
41 |
+ |
42 |
+JAVA_PKG_OPT_USE="jdbc" |
43 |
+ |
44 |
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
45 |
+ |
46 |
+HOMEPAGE="http://mariadb.org/" |
47 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
48 |
+ |
49 |
+IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
50 |
+RESTRICT="!bindist? ( bindist )" |
51 |
+ |
52 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
53 |
+ |
54 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
55 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
56 |
+ |
57 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
58 |
+PATCHES=( |
59 |
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
60 |
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch" |
61 |
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
62 |
+ "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
63 |
+) |
64 |
+COMMON_DEPEND=" |
65 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
66 |
+ server? ( |
67 |
+ extraengine? ( |
68 |
+ odbc? ( dev-db/unixODBC:0= ) |
69 |
+ xml? ( dev-libs/libxml2:2= ) |
70 |
+ sys-libs/zlib[minizip] |
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.41-r1:3=[${MULTILIB_USEDEP}] |
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 |
+ perl? ( !dev-db/mytop |
83 |
+ virtual/perl-Getopt-Long |
84 |
+ dev-perl/TermReadKey |
85 |
+ virtual/perl-Term-ANSIColor |
86 |
+ virtual/perl-Time-HiRes ) |
87 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
88 |
+" |
89 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
90 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
91 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
92 |
+ |
93 |
+pkg_setup() { |
94 |
+ java-pkg-opt-2_pkg_setup |
95 |
+ mysql-multilib-r1_pkg_setup |
96 |
+} |
97 |
+ |
98 |
+pkg_preinst() { |
99 |
+ java-pkg-opt-2_pkg_preinst |
100 |
+ mysql-multilib-r1_pkg_preinst |
101 |
+} |
102 |
+ |
103 |
+src_prepare() { |
104 |
+ java-pkg-opt-2_src_prepare |
105 |
+ mysql-multilib-r1_src_prepare |
106 |
+} |
107 |
+ |
108 |
+src_configure(){ |
109 |
+ # bug 508724 mariadb cannot use ld.gold |
110 |
+ tc-ld-disable-gold |
111 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
112 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
113 |
+ -DWITH_PCRE=system |
114 |
+ ) |
115 |
+ if use server ; then |
116 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
117 |
+ if ! use extraengine ; then |
118 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
119 |
+ -DWITHOUT_FEDERATED=1 |
120 |
+ -DWITHOUT_FEDERATEDX=1 ) |
121 |
+ fi |
122 |
+ |
123 |
+ # Connect with Zip is currently broken and does not compile |
124 |
+ # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 |
125 |
+ |
126 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
127 |
+ $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
128 |
+ $(mysql-cmake_use_plugin sphinx SPHINX) |
129 |
+ $(mysql-cmake_use_plugin tokudb TOKUDB) |
130 |
+ $(mysql-cmake_use_plugin pam AUTH_PAM) |
131 |
+ $(mysql-cmake_use_plugin extraengine SEQUENCE) |
132 |
+ $(mysql-cmake_use_plugin extraengine SPIDER) |
133 |
+ $(mysql-cmake_use_plugin extraengine CONNECT) |
134 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
135 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
136 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
137 |
+ -DWITHOUT_MROONGA=1 |
138 |
+ ) |
139 |
+ fi |
140 |
+ mysql-multilib-r1_src_configure |
141 |
+} |
142 |
+ |
143 |
+# Official test instructions: |
144 |
+# USE='extraengine perl server openssl static-libs' \ |
145 |
+# FEATURES='test userpriv -usersandbox' \ |
146 |
+# ebuild mariadb-X.X.XX.ebuild \ |
147 |
+# digest clean package |
148 |
+multilib_src_test() { |
149 |
+ |
150 |
+ if ! multilib_is_native_abi ; then |
151 |
+ einfo "Server tests not available on non-native abi". |
152 |
+ return 0; |
153 |
+ fi |
154 |
+ |
155 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
156 |
+ local retstatus_unit |
157 |
+ local retstatus_tests |
158 |
+ |
159 |
+ if use server ; then |
160 |
+ |
161 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
162 |
+ # localhost. Also causes weird failures. |
163 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
164 |
+ |
165 |
+ if [[ $UID -eq 0 ]]; then |
166 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
167 |
+ fi |
168 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
169 |
+ |
170 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
171 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
172 |
+ |
173 |
+ # Run CTest (test-units) |
174 |
+ cmake-utils_src_test |
175 |
+ retstatus_unit=$? |
176 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
177 |
+ |
178 |
+ # Ensure that parallel runs don't die |
179 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
180 |
+ # Enable parallel testing, auto will try to detect number of cores |
181 |
+ # You may set this by hand. |
182 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
183 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
184 |
+ |
185 |
+ # create directories because mysqladmin might run out of order |
186 |
+ mkdir -p "${T}"/var-tests{,/log} |
187 |
+ |
188 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
189 |
+ # false positives: |
190 |
+ # |
191 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
192 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
193 |
+ # funcs_1.is_columns_mysql main.bootstrap |
194 |
+ # fails due to USE=-latin1 / utf8 default |
195 |
+ # |
196 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
197 |
+ # main.mysql_client_test_comp: |
198 |
+ # segfaults at random under Portage only, suspect resource limits. |
199 |
+ # |
200 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
201 |
+ # fails due to bad cleanup of previous tests when run in parallel |
202 |
+ # The tool is deprecated anyway |
203 |
+ # Bug 532288 |
204 |
+ |
205 |
+#main.bootstrap \ |
206 |
+ for t in connect.drop-open-error ; do |
207 |
+# main.mysql_client_test_comp \ |
208 |
+# binlog.binlog_statement_insert_delayed main.information_schema \ |
209 |
+# main.mysqld--help \ |
210 |
+# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
211 |
+# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
212 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
213 |
+ done |
214 |
+ |
215 |
+ # Run mysql tests |
216 |
+ pushd "${TESTDIR}" || die |
217 |
+ |
218 |
+ # run mysql-test tests |
219 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
220 |
+ |
221 |
+ retstatus_tests=$? |
222 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
223 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
224 |
+ |
225 |
+ popd || die |
226 |
+ |
227 |
+ # Cleanup is important for these testcases. |
228 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
229 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
230 |
+ |
231 |
+ failures="" |
232 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
233 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
234 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
235 |
+ |
236 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
237 |
+ einfo "Tests successfully completed" |
238 |
+ |
239 |
+ else |
240 |
+ einfo "Skipping server tests due to minimal build." |
241 |
+ fi |
242 |
+} |