| 1 |
commit: ae6c50aa500067df76eaf18bc92acab8eda6308c |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 1 20:47:57 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Tue Jul 1 20:47:57 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ae6c50aa |
| 7 |
|
| 8 |
[mariadb] Version bump to 10.1.0 Alpha |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/mariadb/Manifest | 1 + |
| 12 |
dev-db/mariadb/mariadb-10.1.0_alpha.ebuild | 109 +++++++++++++++++++++++++++++ |
| 13 |
eclass/mysql-cmake.eclass | 22 ++++-- |
| 14 |
eclass/mysql-multilib.eclass | 9 ++- |
| 15 |
4 files changed, 130 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
| 18 |
index f35ad67..fdf9524 100644 |
| 19 |
--- a/dev-db/mariadb/Manifest |
| 20 |
+++ b/dev-db/mariadb/Manifest |
| 21 |
@@ -1,5 +1,6 @@ |
| 22 |
DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef |
| 23 |
DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1 |
| 24 |
+DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4 |
| 25 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
| 26 |
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 |
| 27 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
| 28 |
|
| 29 |
diff --git a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..ad99d88 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild |
| 34 |
@@ -0,0 +1,109 @@ |
| 35 |
+# Copyright 1999-2014 Gentoo Foundation |
| 36 |
+# Distributed under the terms of the GNU General Public License v2 |
| 37 |
+# $Header: $ |
| 38 |
+ |
| 39 |
+EAPI="5" |
| 40 |
+MY_EXTRAS_VER="20140514-0124Z" |
| 41 |
+ |
| 42 |
+inherit toolchain-funcs mysql-multilib |
| 43 |
+# only to make repoman happy. it is really set in the eclass |
| 44 |
+IUSE="$IUSE" |
| 45 |
+ |
| 46 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 47 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~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" |
| 48 |
+ |
| 49 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
| 50 |
+EPATCH_EXCLUDE='' |
| 51 |
+ |
| 52 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
| 53 |
+RDEPEND="${RDEPEND}" |
| 54 |
+ |
| 55 |
+# Official test instructions: |
| 56 |
+# USE='-cluster embedded extraengine perl ssl static-libs community' \ |
| 57 |
+# FEATURES='test userpriv -usersandbox' \ |
| 58 |
+# ebuild mariadb-X.X.XX.ebuild \ |
| 59 |
+# digest clean package |
| 60 |
+multilib_src_test() { |
| 61 |
+ |
| 62 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
| 63 |
+ local retstatus_unit |
| 64 |
+ local retstatus_tests |
| 65 |
+ |
| 66 |
+ multilib_is_native_abi || return |
| 67 |
+ |
| 68 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
| 69 |
+ # localhost. Also causes weird failures. |
| 70 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
| 71 |
+ |
| 72 |
+ if ! use "minimal" ; then |
| 73 |
+ |
| 74 |
+ if [[ $UID -eq 0 ]]; then |
| 75 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
| 76 |
+ fi |
| 77 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 78 |
+ |
| 79 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 80 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
| 81 |
+ |
| 82 |
+ # Run CTest (test-units) |
| 83 |
+ cmake-utils_src_test |
| 84 |
+ retstatus_unit=$? |
| 85 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 86 |
+ |
| 87 |
+ # Ensure that parallel runs don't die |
| 88 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
| 89 |
+ |
| 90 |
+ # create directories because mysqladmin might right out of order |
| 91 |
+ mkdir -p "${S}"/mysql-test/var-tests{,/log} |
| 92 |
+ |
| 93 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
| 94 |
+ # false positives: |
| 95 |
+ # |
| 96 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
| 97 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
| 98 |
+ # funcs_1.is_columns_mysql |
| 99 |
+ # fails due to USE=-latin1 / utf8 default |
| 100 |
+ # |
| 101 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock: |
| 102 |
+ # segfaults at random under Portage only, suspect resource limits. |
| 103 |
+ # |
| 104 |
+ # plugins.unix_socket |
| 105 |
+ # fails because portage strips out the USER enviornment variable |
| 106 |
+ # |
| 107 |
+ |
| 108 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
| 109 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
| 110 |
+ main.mysqld--help plugins.unix_socket \ |
| 111 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
| 112 |
+ mysql-multilib_disable_test "$t" "False positives in Gentoo" |
| 113 |
+ done |
| 114 |
+ |
| 115 |
+ # Run mysql tests |
| 116 |
+ pushd "${TESTDIR}" || die |
| 117 |
+ |
| 118 |
+ # run mysql-test tests |
| 119 |
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files |
| 120 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect |
| 121 |
+ retstatus_tests=$? |
| 122 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
| 123 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 124 |
+ |
| 125 |
+ popd || die |
| 126 |
+ |
| 127 |
+ # Cleanup is important for these testcases. |
| 128 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
| 129 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
| 130 |
+ |
| 131 |
+ failures="" |
| 132 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
| 133 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
| 134 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 135 |
+ |
| 136 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
| 137 |
+ einfo "Tests successfully completed" |
| 138 |
+ |
| 139 |
+ else |
| 140 |
+ |
| 141 |
+ einfo "Skipping server tests due to minimal build." |
| 142 |
+ fi |
| 143 |
+} |
| 144 |
|
| 145 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 146 |
index 908e66e..4578020 100644 |
| 147 |
--- a/eclass/mysql-cmake.eclass |
| 148 |
+++ b/eclass/mysql-cmake.eclass |
| 149 |
@@ -76,9 +76,9 @@ mysql-cmake_disable_test() { |
| 150 |
mysql-cmake_use_plugin() { |
| 151 |
[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>" |
| 152 |
if use_if_iuse $1 ; then |
| 153 |
- echo "-DWITH_$2=1" |
| 154 |
+ echo "-DWITH_$2=1 -DPLUGIN_$2=YES" |
| 155 |
else |
| 156 |
- echo "-DWITHOUT_$2=1 -DWITH_$2=0" |
| 157 |
+ echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" |
| 158 |
fi |
| 159 |
} |
| 160 |
|
| 161 |
@@ -129,7 +129,15 @@ configure_cmake_minimal() { |
| 162 |
-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1 |
| 163 |
-DWITHOUT_MYISAM_STORAGE_ENGINE=1 |
| 164 |
-DWITHOUT_PARTITION_STORAGE_ENGINE=1 |
| 165 |
- -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 |
| 166 |
+ -DPLUGIN_ARCHIVE=NO |
| 167 |
+ -DPLUGIN_BLACKHOLE=NO |
| 168 |
+ -DPLUGIN_CSV=NO |
| 169 |
+ -DPLUGIN_FEDERATED=NO |
| 170 |
+ -DPLUGIN_HEAP=NO |
| 171 |
+ -DPLUGIN_INNOBASE=NO |
| 172 |
+ -DPLUGIN_MYISAMMRG=NO |
| 173 |
+ -DPLUGIN_MYISAM=NO |
| 174 |
+ -DPLUGIN_PARTITION=NO |
| 175 |
) |
| 176 |
} |
| 177 |
|
| 178 |
@@ -191,10 +199,12 @@ configure_cmake_standard() { |
| 179 |
# CassandraSE needs Apache Thrift which is not in portage |
| 180 |
mycmakeargs+=( |
| 181 |
-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0 |
| 182 |
+ -DPLUGIN_CASSANDRA=NO |
| 183 |
$(mysql-cmake_use_plugin extraengine SEQUENCE) |
| 184 |
$(mysql-cmake_use_plugin extraengine SPIDER) |
| 185 |
$(mysql-cmake_use_plugin extraengine CONNECT) |
| 186 |
-DCONNECT_WITH_MYSQL=1 |
| 187 |
+ -DPLUGIN_CONNECT_WITH_MYSQL=YES |
| 188 |
$(cmake-utils_use xml CONNECT_WITH_LIBXML2) |
| 189 |
$(cmake-utils_use odbc CONNECT_WITH_ODBC) |
| 190 |
) |
| 191 |
@@ -309,9 +319,7 @@ mysql-cmake_src_configure() { |
| 192 |
-DWITH_SSL=$(usex ssl system bundled) |
| 193 |
) |
| 194 |
|
| 195 |
- if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 196 |
- mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 197 |
- else |
| 198 |
+ if in_iuse bindist ; then |
| 199 |
mycmakeargs+=( |
| 200 |
-DWITH_READLINE=$(usex bindist 1 0) |
| 201 |
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 202 |
@@ -319,6 +327,8 @@ mysql-cmake_src_configure() { |
| 203 |
) |
| 204 |
fi |
| 205 |
|
| 206 |
+ mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 207 |
+ |
| 208 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 209 |
mycmakeargs+=( |
| 210 |
-DWITH_JEMALLOC=$(usex jemalloc system) |
| 211 |
|
| 212 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 213 |
index 53df055..42f965e 100644 |
| 214 |
--- a/eclass/mysql-multilib.eclass |
| 215 |
+++ b/eclass/mysql-multilib.eclass |
| 216 |
@@ -303,7 +303,7 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 217 |
~virtual/mysql-${MYSQL_PV_MAJOR}" |
| 218 |
|
| 219 |
# my_config.h includes ABI specific data |
| 220 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h ) |
| 221 |
+MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) |
| 222 |
|
| 223 |
# |
| 224 |
# HELPER FUNCTIONS: |
| 225 |
@@ -430,16 +430,15 @@ multilib_src_configure() { |
| 226 |
-DWITH_SSL=$(usex ssl system bundled) |
| 227 |
) |
| 228 |
|
| 229 |
- if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 230 |
- mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 231 |
- else |
| 232 |
+ if in_iuse bindist ; then |
| 233 |
mycmakeargs+=( |
| 234 |
-DWITH_READLINE=$(usex bindist 1 0) |
| 235 |
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 236 |
- $(usex bindist -DHAVE_BFD_H=0) |
| 237 |
+ $(usex bindist -DHAVE_BFD_H=0 '') |
| 238 |
) |
| 239 |
fi |
| 240 |
|
| 241 |
+ mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 242 |
|
| 243 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 244 |
mycmakeargs+=( |
Archives