| 1 |
commit: b7a8e3978f66bb2fa4d208476f541796ca49013f |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 13 21:42:37 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 13 21:42:37 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b7a8e397 |
| 7 |
|
| 8 |
Changes to the new mysql-multilib-r1 eclass and associated ebuilds |
| 9 |
|
| 10 |
dev-db/mariadb-connector-c/Manifest | 22 ++++ |
| 11 |
dev-db/mariadb/mariadb-10.1.9-r1.ebuild | 14 +-- |
| 12 |
dev-db/mysql/Manifest | 3 +- |
| 13 |
.../mysql-5.6.28.ebuild} | 130 ++++++++++----------- |
| 14 |
.../percona-server-5.6.26.74.0-r1.ebuild | 10 +- |
| 15 |
eclass/mysql-multilib-r1.eclass | 27 ++--- |
| 16 |
6 files changed, 110 insertions(+), 96 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
| 19 |
index b94a3e6..f2d8d4d 100644 |
| 20 |
--- a/dev-db/mariadb-connector-c/Manifest |
| 21 |
+++ b/dev-db/mariadb-connector-c/Manifest |
| 22 |
@@ -1,2 +1,24 @@ |
| 23 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 24 |
+Hash: SHA256 |
| 25 |
+ |
| 26 |
DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624 |
| 27 |
DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55 |
| 28 |
+-----BEGIN PGP SIGNATURE----- |
| 29 |
+Version: GnuPG v2.0 |
| 30 |
+ |
| 31 |
+iQJ8BAEBCABmBQJVz8uUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 32 |
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
| 33 |
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2a6YP/31jEv+FjVwcuXO5twJo/GDD |
| 34 |
+TvolosUT979zeD8/VHlrLykAsDJIIqUlVPeHA9bdJ+FvksFvKqi5bZmHJiKcc93z |
| 35 |
+Spvu/z0s8T1BRez5GK3R0iljabebGKkpIg+s3CfFrOlXtyuco+7m/vG+GfAvaqZP |
| 36 |
+61yMWVc8Exj0BtiQCSMFaCLeueVcyW3Np7dvp+jPXG4A+pILLJigq/mOp8Gf+aSb |
| 37 |
+8WZbhqaXipuYc5IONjEdyROabKBfp2PsuU/I+TNPo1aF5mgfQ6YUBok2h5A8+i1R |
| 38 |
+jOvUMP45kt7AannwTrnPU8l0KbGhvwBhI2HF30BggPDEjFTlLitv/xaDUJUEaYpm |
| 39 |
+d24PtCP3fPOetEX9v5K+dIde/XeGdhmLA02yyh2oH9Ryvmkawu/+n7UHR5YVS3/F |
| 40 |
+N0lBgK1QlpoWlI3mhlyh/vh7dbzQxsJSISNUipS79HIot4JNgxoneawOZDbGXhnO |
| 41 |
+xxReUHb8AkN8hY1TnaUquXNBtZ5BQpqQkcLEoeZMZEIZ9FX4mvd8ZldmEYhGQmTP |
| 42 |
+UkEATZiKn8PhVMkAOiaUONpIX38D+EzfUBfxnOEem0TF0P8rgDsjEfzkOAuWmrun |
| 43 |
+F8WIBNwPpcZjVm2y7h8lwCTJUl0o2qkMkk+Acw/1y8eOUlO+fW3LMGu7xBrFmoP+ |
| 44 |
+f5w97K+BgCuRL7ulssrQ |
| 45 |
+=48nq |
| 46 |
+-----END PGP SIGNATURE----- |
| 47 |
|
| 48 |
diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild |
| 49 |
index 7ec76dd..6fbdc74 100644 |
| 50 |
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild |
| 51 |
+++ b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild |
| 52 |
@@ -66,19 +66,19 @@ MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
| 53 |
src_configure(){ |
| 54 |
# bug 508724 mariadb cannot use ld.gold |
| 55 |
tc-ld-disable-gold |
| 56 |
- local MYSQL_CMAKE_NATIVE_DEFINES=" |
| 57 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
| 58 |
-DWITH_JEMALLOC=$(usex jemalloc system) |
| 59 |
-DWITH_PCRE=system |
| 60 |
- " |
| 61 |
+ ) |
| 62 |
if use server ; then |
| 63 |
# Federated{,X} must be treated special otherwise they will not be built as plugins |
| 64 |
if ! use extraengine ; then |
| 65 |
- MYSQL_CMAKE_NATIVE_DEFINES+=" |
| 66 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
| 67 |
-DPLUGIN_FEDERATED=NO |
| 68 |
- -DPLUGIN_FEDERATEDX=NO" |
| 69 |
+ -DPLUGIN_FEDERATEDX=NO ) |
| 70 |
fi |
| 71 |
|
| 72 |
- MYSQL_CMAKE_NATIVE_DEFINES+=" |
| 73 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
| 74 |
-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
| 75 |
-DPLUGIN_SPHINX=$(usex sphinx YES NO) |
| 76 |
-DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
| 77 |
@@ -95,9 +95,9 @@ src_configure(){ |
| 78 |
-DWITH_INNODB_LZ4=$(usex innodb-lz4) |
| 79 |
-DWITH_INNODB_LZO=$(usex innodb-lzo) |
| 80 |
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
| 81 |
- " |
| 82 |
+ ) |
| 83 |
|
| 84 |
- use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+="-DWITHOUT_MROONGA=1" |
| 85 |
+ use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 ) |
| 86 |
fi |
| 87 |
mysql-multilib-r1_src_configure |
| 88 |
} |
| 89 |
|
| 90 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
| 91 |
index 4b58fed..ca2d123 100644 |
| 92 |
--- a/dev-db/mysql/Manifest |
| 93 |
+++ b/dev-db/mysql/Manifest |
| 94 |
@@ -4,14 +4,15 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575 |
| 95 |
DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942 |
| 96 |
DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535 |
| 97 |
DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7 |
| 98 |
+DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2 |
| 99 |
DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5 |
| 100 |
DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32 |
| 101 |
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec |
| 102 |
DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551 |
| 103 |
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213 |
| 104 |
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc |
| 105 |
+DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4 |
| 106 |
DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb |
| 107 |
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22 |
| 108 |
-DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034 |
| 109 |
DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 |
| 110 |
DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf |
| 111 |
|
| 112 |
diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild b/dev-db/mysql/mysql-5.6.28.ebuild |
| 113 |
similarity index 55% |
| 114 |
copy from dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild |
| 115 |
copy to dev-db/mysql/mysql-5.6.28.ebuild |
| 116 |
index 4df5953..c41c878 100644 |
| 117 |
--- a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild |
| 118 |
+++ b/dev-db/mysql/mysql-5.6.28.ebuild |
| 119 |
@@ -3,56 +3,46 @@ |
| 120 |
# $Id$ |
| 121 |
|
| 122 |
EAPI="5" |
| 123 |
+ |
| 124 |
MY_EXTRAS_VER="20150717-1707Z" |
| 125 |
+MY_PV="${PV//_alpha_pre/-m}" |
| 126 |
+MY_PV="${MY_PV//_/-}" |
| 127 |
+HAS_TOOLS_PATCH="1" |
| 128 |
SUBSLOT="18" |
| 129 |
-PYTHON_COMPAT=( python2_7 ) |
| 130 |
-inherit toolchain-funcs python-any-r1 mysql-multilib-r1 |
| 131 |
|
| 132 |
-IUSE="pam tokudb tokudb-backup-plugin" |
| 133 |
+inherit mysql-multilib-r1 |
| 134 |
+# only to make repoman happy. it is really set in the eclass |
| 135 |
+IUSE="$IUSE" |
| 136 |
|
| 137 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 138 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" |
| 139 |
-HOMEPAGE="http://www.percona.com/software/percona-server" |
| 140 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team" |
| 141 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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" |
| 142 |
|
| 143 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
| 144 |
EPATCH_EXCLUDE='' |
| 145 |
|
| 146 |
-COMMON_DEPEND="server? ( pam? ( virtual/pam:0= ) ) |
| 147 |
- tokudb? ( app-arch/snappy ) |
| 148 |
- tokudb-backup-plugin? ( dev-util/valgrind ) |
| 149 |
- " |
| 150 |
- |
| 151 |
-DEPEND="${COMMON_DEPEND} |
| 152 |
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
| 153 |
- test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )" |
| 154 |
-RDEPEND="${COMMON_DEPEND}" |
| 155 |
- |
| 156 |
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )" |
| 157 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
| 158 |
+RDEPEND="${RDEPEND}" |
| 159 |
|
| 160 |
# Please do not add a naive src_unpack to this ebuild |
| 161 |
# If you want to add a single patch, copy the ebuild to an overlay |
| 162 |
# and create your own mysql-extras tarball, looking at 000_index.txt |
| 163 |
|
| 164 |
-python_check_deps() { |
| 165 |
- has_version "dev-python/mysql-python[${PYTHON_USEDEP}]" |
| 166 |
-} |
| 167 |
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) |
| 168 |
+# disable until we see what happens with it |
| 169 |
+MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 ) |
| 170 |
|
| 171 |
-src_configure() { |
| 172 |
- local MYSQL_CMAKE_NATIVE_DEFINES="-DWITH_PAM=$(usex pam)" |
| 173 |
- if use tokudb ; then |
| 174 |
- # TokuDB Backup plugin requires valgrind unconditionally |
| 175 |
- MYSQL_CMAKE_NATIVE_DEFINES+=" |
| 176 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
| 177 |
- $(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1) |
| 178 |
- " |
| 179 |
+src_prepare() { |
| 180 |
+ mysql-multilib-r1_src_prepare |
| 181 |
+ if use libressl ; then |
| 182 |
+ sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 183 |
+ "${S}/cmake/ssl.cmake" || die |
| 184 |
fi |
| 185 |
} |
| 186 |
|
| 187 |
# Official test instructions: |
| 188 |
-# USE='extraengine perl openssl static-libs' \ |
| 189 |
+# USE='server embedded extraengine perl openssl static-libs' \ |
| 190 |
# FEATURES='test userpriv -usersandbox' \ |
| 191 |
-# ebuild percona-server-X.X.XX.ebuild \ |
| 192 |
+# ebuild mysql-X.X.XX.ebuild \ |
| 193 |
# digest clean package |
| 194 |
multilib_src_test() { |
| 195 |
|
| 196 |
@@ -61,7 +51,7 @@ multilib_src_test() { |
| 197 |
return 0; |
| 198 |
fi |
| 199 |
|
| 200 |
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
| 201 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
| 202 |
local retstatus_unit |
| 203 |
local retstatus_tests |
| 204 |
|
| 205 |
@@ -84,6 +74,13 @@ multilib_src_test() { |
| 206 |
retstatus_unit=$? |
| 207 |
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 208 |
|
| 209 |
+ # Create a symlink to provided binaries so the tests can find them when client-libs is off |
| 210 |
+ if ! use client-libs ; then |
| 211 |
+ ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die |
| 212 |
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die |
| 213 |
+ mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" |
| 214 |
+ fi |
| 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 |
@@ -94,60 +91,64 @@ multilib_src_test() { |
| 220 |
# create directories because mysqladmin might right out of order |
| 221 |
mkdir -p "${T}"/var-tests{,/log} |
| 222 |
|
| 223 |
- # Create a symlink to provided binaries so the tests can find them when client-libs is off |
| 224 |
- if ! use client-libs ; then |
| 225 |
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die |
| 226 |
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die |
| 227 |
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" |
| 228 |
- fi |
| 229 |
+ # create symlink for the tests to find mysql_tzinfo_to_sql |
| 230 |
+ ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
| 231 |
|
| 232 |
- # These are failing in Percona 5.6 for now and are believed to be |
| 233 |
+ # These are failing in MySQL 5.5/5.6 for now and are believed to be |
| 234 |
# false positives: |
| 235 |
# |
| 236 |
# main.information_schema, binlog.binlog_statement_insert_delayed, |
| 237 |
- # main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter |
| 238 |
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt |
| 239 |
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers |
| 240 |
- # engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate |
| 241 |
- # engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 |
| 242 |
- # engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate |
| 243 |
+ # funcs_1.is_triggers funcs_1.is_tables_mysql, |
| 244 |
+ # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, |
| 245 |
+ # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, |
| 246 |
+ # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql |
| 247 |
+ # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter |
| 248 |
# fails due to USE=-latin1 / utf8 default |
| 249 |
# |
| 250 |
# main.mysql_client_test: |
| 251 |
# segfaults at random under Portage only, suspect resource limits. |
| 252 |
# |
| 253 |
- # main.percona_bug1289599 |
| 254 |
- # Looks to be a syntax error in the test file itself |
| 255 |
- # |
| 256 |
- # main.variables main.myisam main.merge_recover |
| 257 |
- # fails due to ulimit not able to open enough files (needs 5000) |
| 258 |
+ # rpl.rpl_plugin_load |
| 259 |
+ # fails due to included file not listed in expected result |
| 260 |
+ # appears to be poor planning |
| 261 |
# |
| 262 |
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
| 263 |
- # Called with bad parameters should be reported upstream |
| 264 |
- # |
| 265 |
- |
| 266 |
- for t in main.mysql_client_test \ |
| 267 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
| 268 |
- main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \ |
| 269 |
- perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \ |
| 270 |
- funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \ |
| 271 |
- main.variables main.myisam main.merge_recover \ |
| 272 |
- engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \ |
| 273 |
- engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \ |
| 274 |
- engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \ |
| 275 |
- main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do |
| 276 |
+ # fails due to bad cleanup of previous tests when run in parallel |
| 277 |
+ # The tool is deprecated anyway |
| 278 |
+ # Bug 532288 |
| 279 |
+ for t in \ |
| 280 |
+ binlog.binlog_mysqlbinlog_filter \ |
| 281 |
+ binlog.binlog_statement_insert_delayed \ |
| 282 |
+ funcs_1.is_columns_mysql \ |
| 283 |
+ funcs_1.is_tables_mysql \ |
| 284 |
+ funcs_1.is_triggers \ |
| 285 |
+ main.information_schema \ |
| 286 |
+ main.mysql_client_test \ |
| 287 |
+ main.mysqld--help-notwin \ |
| 288 |
+ perfschema.binlog_edge_mix \ |
| 289 |
+ perfschema.binlog_edge_stmt \ |
| 290 |
+ rpl.rpl_plugin_load \ |
| 291 |
+ main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
| 292 |
+ ; do |
| 293 |
mysql-multilib_disable_test "$t" "False positives in Gentoo" |
| 294 |
done |
| 295 |
|
| 296 |
+ if ! use extraengine ; then |
| 297 |
+ # bug 401673, 530766 |
| 298 |
+ for t in federated.federated_plugin ; do |
| 299 |
+ mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" |
| 300 |
+ done |
| 301 |
+ fi |
| 302 |
+ |
| 303 |
# Run mysql tests |
| 304 |
pushd "${TESTDIR}" |
| 305 |
|
| 306 |
# Set file limits higher so tests run |
| 307 |
ulimit -n 3000 |
| 308 |
- python_setup |
| 309 |
+ |
| 310 |
# run mysql-test tests |
| 311 |
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
| 312 |
- --testcase-timeout=30 --reorder |
| 313 |
+ --suite-timeout=5000 --reorder |
| 314 |
retstatus_tests=$? |
| 315 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
| 316 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 317 |
@@ -167,7 +168,6 @@ multilib_src_test() { |
| 318 |
einfo "Tests successfully completed" |
| 319 |
|
| 320 |
else |
| 321 |
- |
| 322 |
einfo "Skipping server tests due to minimal build." |
| 323 |
fi |
| 324 |
} |
| 325 |
|
| 326 |
diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild b/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild |
| 327 |
index 4df5953..5641679 100644 |
| 328 |
--- a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild |
| 329 |
+++ b/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild |
| 330 |
@@ -39,14 +39,16 @@ python_check_deps() { |
| 331 |
} |
| 332 |
|
| 333 |
src_configure() { |
| 334 |
- local MYSQL_CMAKE_NATIVE_DEFINES="-DWITH_PAM=$(usex pam)" |
| 335 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_PAM=$(usex pam) |
| 336 |
+ $(mysql-cmake_use_plugin tokudb TOKUDB) |
| 337 |
+ ) |
| 338 |
if use tokudb ; then |
| 339 |
# TokuDB Backup plugin requires valgrind unconditionally |
| 340 |
- MYSQL_CMAKE_NATIVE_DEFINES+=" |
| 341 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
| 342 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
| 343 |
$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1) |
| 344 |
- " |
| 345 |
+ ) |
| 346 |
fi |
| 347 |
+ mysql-multilib-r1_src_configure |
| 348 |
} |
| 349 |
|
| 350 |
# Official test instructions: |
| 351 |
|
| 352 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 353 |
index 5969d6b..72dcd68 100644 |
| 354 |
--- a/eclass/mysql-multilib-r1.eclass |
| 355 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 356 |
@@ -110,7 +110,8 @@ if [[ -z ${SERVER_URI} ]]; then |
| 357 |
URI_A="${URI_FILE}-${MY_PV}.tar.gz" |
| 358 |
MIRROR_PV=$(get_version_component_range 1-2 ${PV}) |
| 359 |
# Recently upstream switched to an archive site, and not on mirrors |
| 360 |
- SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}" |
| 361 |
+ SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A} |
| 362 |
+ http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}" |
| 363 |
fi |
| 364 |
fi |
| 365 |
|
| 366 |
@@ -328,19 +329,7 @@ mysql-multilib-r1_src_configure() { |
| 367 |
# Bug #114895, bug #110149 |
| 368 |
filter-flags "-O" "-O[01]" |
| 369 |
|
| 370 |
- CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" |
| 371 |
- CXXFLAGS="${CXXFLAGS} -felide-constructors" |
| 372 |
- # Causes linkage failures. Upstream bug #59607 removes it |
| 373 |
- if ! mysql_version_is_at_least "5.6" ; then |
| 374 |
- CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" |
| 375 |
- fi |
| 376 |
- # As of 5.7, exceptions are used! |
| 377 |
- if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.26" ; then |
| 378 |
- CXXFLAGS="${CXXFLAGS} -fno-rtti" |
| 379 |
- elif ! mysql_version_is_at_least "5.7" ; then |
| 380 |
- CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti" |
| 381 |
- fi |
| 382 |
- export CXXFLAGS |
| 383 |
+ append-cxxflags -felide-constructors -fno-rtti |
| 384 |
|
| 385 |
# bug #283926, with GCC4.4, this is required to get correct behavior. |
| 386 |
append-flags -fno-strict-aliasing |
| 387 |
@@ -485,14 +474,14 @@ multilib_src_configure() { |
| 388 |
|
| 389 |
# systemtap only works on native ABI bug 530132 |
| 390 |
if multilib_is_native_abi; then |
| 391 |
- mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap) ) |
| 392 |
- [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} ) |
| 393 |
+ mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap) |
| 394 |
+ "${MYSQL_CMAKE_NATIVE_DEFINES[@]}" ) |
| 395 |
else |
| 396 |
- mycmakeargs+=( -DENABLE_DTRACE=0 ) |
| 397 |
- [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} ) |
| 398 |
+ mycmakeargs+=( -DENABLE_DTRACE=0 |
| 399 |
+ "${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" ) |
| 400 |
fi |
| 401 |
|
| 402 |
- [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} ) |
| 403 |
+ mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" ) |
| 404 |
|
| 405 |
cmake-utils_src_configure |
| 406 |
} |
Archives