| 1 |
commit: c66425b1feb5c5cefdc30ffb515aeb3c28055139 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 31 02:27:34 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 31 02:27:34 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c66425b1 |
| 7 |
|
| 8 |
Version bump with eclass additions |
| 9 |
|
| 10 |
dev-db/mysql/Manifest | 1 + |
| 11 |
...sql-5.6.25-r1.ebuild => mysql-5.6.26-r1.ebuild} | 6 +++- |
| 12 |
...{mysql-5.6.25-r1.ebuild => mysql-5.6.26.ebuild} | 21 ++++++-------- |
| 13 |
eclass/mysql-multilib.eclass | 32 ++++++++++++++++------ |
| 14 |
4 files changed, 39 insertions(+), 21 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
| 17 |
index 8f2737c..692f7a5 100644 |
| 18 |
--- a/dev-db/mysql/Manifest |
| 19 |
+++ b/dev-db/mysql/Manifest |
| 20 |
@@ -6,6 +6,7 @@ DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560 |
| 21 |
DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc |
| 22 |
DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011 |
| 23 |
DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194 |
| 24 |
+DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f |
| 25 |
DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc |
| 26 |
DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5 |
| 27 |
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec |
| 28 |
|
| 29 |
diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild |
| 30 |
similarity index 94% |
| 31 |
copy from dev-db/mysql/mysql-5.6.25-r1.ebuild |
| 32 |
copy to dev-db/mysql/mysql-5.6.26-r1.ebuild |
| 33 |
index b0ce8d0..a334c33 100644 |
| 34 |
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild |
| 35 |
+++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild |
| 36 |
@@ -1,6 +1,6 @@ |
| 37 |
# Copyright 1999-2015 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 2015/07/28 02:26:58 grknight Exp $ |
| 40 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $ |
| 41 |
|
| 42 |
EAPI="5" |
| 43 |
|
| 44 |
@@ -27,6 +27,10 @@ RDEPEND="${RDEPEND}" |
| 45 |
# If you want to add a single patch, copy the ebuild to an overlay |
| 46 |
# and create your own mysql-extras tarball, looking at 000_index.txt |
| 47 |
|
| 48 |
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) |
| 49 |
+# disable until we see what happens with it |
| 50 |
+MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" |
| 51 |
+ |
| 52 |
# Official test instructions: |
| 53 |
# USE='server embedded extraengine perl ssl static-libs community' \ |
| 54 |
# FEATURES='test userpriv -usersandbox' \ |
| 55 |
|
| 56 |
diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild |
| 57 |
similarity index 88% |
| 58 |
rename from dev-db/mysql/mysql-5.6.25-r1.ebuild |
| 59 |
rename to dev-db/mysql/mysql-5.6.26.ebuild |
| 60 |
index b0ce8d0..0323526 100644 |
| 61 |
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild |
| 62 |
+++ b/dev-db/mysql/mysql-5.6.26.ebuild |
| 63 |
@@ -1,13 +1,12 @@ |
| 64 |
# Copyright 1999-2015 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 2015/07/28 02:26:58 grknight Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $ |
| 68 |
|
| 69 |
EAPI="5" |
| 70 |
|
| 71 |
-MY_EXTRAS_VER="20150717-1707Z" |
| 72 |
+MY_EXTRAS_VER="20150410-1944Z" |
| 73 |
MY_PV="${PV//_alpha_pre/-m}" |
| 74 |
MY_PV="${MY_PV//_/-}" |
| 75 |
-HAS_TOOLS_PATCH="1" |
| 76 |
SUBSLOT="18" |
| 77 |
|
| 78 |
inherit toolchain-funcs mysql-multilib |
| 79 |
@@ -27,8 +26,12 @@ RDEPEND="${RDEPEND}" |
| 80 |
# If you want to add a single patch, copy the ebuild to an overlay |
| 81 |
# and create your own mysql-extras tarball, looking at 000_index.txt |
| 82 |
|
| 83 |
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) |
| 84 |
+# disable until we see what happens with it |
| 85 |
+MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" |
| 86 |
+ |
| 87 |
# Official test instructions: |
| 88 |
-# USE='server embedded extraengine perl ssl static-libs community' \ |
| 89 |
+# USE='embedded extraengine perl ssl static-libs community' \ |
| 90 |
# FEATURES='test userpriv -usersandbox' \ |
| 91 |
# ebuild mysql-X.X.XX.ebuild \ |
| 92 |
# digest clean package |
| 93 |
@@ -47,7 +50,7 @@ multilib_src_test() { |
| 94 |
# localhost. Also causes weird failures. |
| 95 |
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
| 96 |
|
| 97 |
- if use server ; then |
| 98 |
+ if ! use "minimal" ; then |
| 99 |
|
| 100 |
if [[ $UID -eq 0 ]]; then |
| 101 |
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
| 102 |
@@ -62,13 +65,6 @@ multilib_src_test() { |
| 103 |
retstatus_unit=$? |
| 104 |
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 105 |
|
| 106 |
- # Create a symlink to provided binaries so the tests can find them when client-libs is off |
| 107 |
- if ! use client-libs ; then |
| 108 |
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die |
| 109 |
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die |
| 110 |
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" |
| 111 |
- fi |
| 112 |
- |
| 113 |
# Ensure that parallel runs don't die |
| 114 |
export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
| 115 |
# Enable parallel testing, auto will try to detect number of cores |
| 116 |
@@ -156,6 +152,7 @@ multilib_src_test() { |
| 117 |
einfo "Tests successfully completed" |
| 118 |
|
| 119 |
else |
| 120 |
+ |
| 121 |
einfo "Skipping server tests due to minimal build." |
| 122 |
fi |
| 123 |
} |
| 124 |
|
| 125 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 126 |
index 65422e4..f48024d 100644 |
| 127 |
--- a/eclass/mysql-multilib.eclass |
| 128 |
+++ b/eclass/mysql-multilib.eclass |
| 129 |
@@ -1,6 +1,6 @@ |
| 130 |
# Copyright 1999-2015 Gentoo Foundation |
| 131 |
# Distributed under the terms of the GNU General Public License v2 |
| 132 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $ |
| 133 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27 2015/07/30 20:34:57 grknight Exp $ |
| 134 |
|
| 135 |
# @ECLASS: mysql-multilib.eclass |
| 136 |
# @MAINTAINER: |
| 137 |
@@ -45,6 +45,18 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_ |
| 138 |
# VARIABLES: |
| 139 |
# |
| 140 |
|
| 141 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES |
| 142 |
+# @DESCRIPTION: |
| 143 |
+# Add extra CMake arguments for native multilib builds |
| 144 |
+ |
| 145 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES |
| 146 |
+# @DESCRIPTION: |
| 147 |
+# Add extra CMake arguments for non-native multilib builds |
| 148 |
+ |
| 149 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES |
| 150 |
+# @DESCRIPTION: |
| 151 |
+# Add extra CMake arguments |
| 152 |
+ |
| 153 |
# Shorten the path because the socket path length must be shorter than 107 chars |
| 154 |
# and we will run a mysql server during test phase |
| 155 |
S="${WORKDIR}/mysql" |
| 156 |
@@ -624,13 +636,6 @@ multilib_src_configure() { |
| 157 |
-DWITH_DEFAULT_FEATURE_SET=0 |
| 158 |
) |
| 159 |
|
| 160 |
- # systemtap only works on native ABI bug 530132 |
| 161 |
- if multilib_is_native_abi; then |
| 162 |
- mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) |
| 163 |
- else |
| 164 |
- mycmakeargs+=( -DENABLE_DTRACE=0 ) |
| 165 |
- fi |
| 166 |
- |
| 167 |
if in_iuse client-libs ; then |
| 168 |
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) ) |
| 169 |
fi |
| 170 |
@@ -687,6 +692,17 @@ multilib_src_configure() { |
| 171 |
fi |
| 172 |
fi |
| 173 |
|
| 174 |
+ # systemtap only works on native ABI bug 530132 |
| 175 |
+ if multilib_is_native_abi; then |
| 176 |
+ mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) |
| 177 |
+ [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} ) |
| 178 |
+ else |
| 179 |
+ mycmakeargs+=( -DENABLE_DTRACE=0 ) |
| 180 |
+ [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} ) |
| 181 |
+ fi |
| 182 |
+ |
| 183 |
+ [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} ) |
| 184 |
+ |
| 185 |
# Always build NDB with mysql-cluster for libndbclient |
| 186 |
[[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=( |
| 187 |
-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1 |
Archives