| 1 |
commit: 799be1104533d4c6b07300a0c74f650754066957 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 00:05:32 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 00:05:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799be110 |
| 7 |
|
| 8 |
Revert "dev-db/mariadb: Add net-libs/libnsl dependencies" |
| 9 |
|
| 10 |
This reverts commit b081514850b14f9d2e434865385f1994e456dfc9. |
| 11 |
|
| 12 |
dev-db/mariadb/Manifest | 2 + |
| 13 |
...riadb-10.2.14.ebuild => mariadb-10.2.12.ebuild} | 129 ++++++++------------- |
| 14 |
...riadb-10.2.14.ebuild => mariadb-10.2.13.ebuild} | 8 +- |
| 15 |
dev-db/mariadb/mariadb-10.2.14.ebuild | 6 +- |
| 16 |
dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 24 +--- |
| 17 |
5 files changed, 60 insertions(+), 109 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
| 20 |
index 6c694917ebe..b87e6c83080 100644 |
| 21 |
--- a/dev-db/mariadb/Manifest |
| 22 |
+++ b/dev-db/mariadb/Manifest |
| 23 |
@@ -5,6 +5,8 @@ DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388 |
| 24 |
DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd |
| 25 |
DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89 |
| 26 |
DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07 SHA512 fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a |
| 27 |
+DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 50a72b8096ae8bd5dc635352fc35d22322a0d7cf415e45883898307050ec547a79c66d51ab0ce311f1895eb178afeb49664fb434af77f9ff2b9aedef0aea85bc SHA512 8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b |
| 28 |
+DIST mariadb-10.2.13.tar.gz 72591913 BLAKE2B 5abc3fefc5b02f099254b8a3a832a20793989a316efdc22b146cf78b5b83fcb3e4e617fce1b9161194e3f54b7bb469de3bb656319048fb137915af24e21f6aa2 SHA512 4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca |
| 29 |
DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026 |
| 30 |
DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457 SHA512 e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004 |
| 31 |
DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c |
| 32 |
|
| 33 |
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild |
| 34 |
similarity index 91% |
| 35 |
copy from dev-db/mariadb/mariadb-10.2.14.ebuild |
| 36 |
copy to dev-db/mariadb/mariadb-10.2.12.ebuild |
| 37 |
index 90f70d1e201..73d4cd9e20e 100644 |
| 38 |
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild |
| 39 |
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild |
| 40 |
@@ -2,7 +2,7 @@ |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
EAPI="6" |
| 44 |
-MY_EXTRAS_VER="20180308-1938Z" |
| 45 |
+MY_EXTRAS_VER="20170926-1321Z" |
| 46 |
SUBSLOT="18" |
| 47 |
|
| 48 |
JAVA_PKG_OPT_USE="jdbc" |
| 49 |
@@ -28,7 +28,7 @@ HOMEPAGE="http://mariadb.org/" |
| 50 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
| 51 |
LICENSE="GPL-2 LGPL-2.1+" |
| 52 |
SLOT="0/${SUBSLOT:-0}" |
| 53 |
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 |
| 54 |
+IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4 |
| 55 |
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga |
| 56 |
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx |
| 57 |
sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc |
| 58 |
@@ -39,11 +39,12 @@ RESTRICT="!bindist? ( bindist ) libressl? ( test )" |
| 59 |
|
| 60 |
REQUIRED_USE="jdbc? ( extraengine server !static ) |
| 61 |
server? ( tokudb? ( jemalloc !tcmalloc ) ) |
| 62 |
- !server? ( !extraengine ) |
| 63 |
+ !server? ( !extraengine !embedded ) |
| 64 |
?? ( tcmalloc jemalloc ) |
| 65 |
static? ( yassl !pam )" |
| 66 |
|
| 67 |
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 68 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 69 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 70 |
|
| 71 |
# Shorten the path because the socket path length must be shorter than 107 chars |
| 72 |
# and we will run a mysql server during test phase |
| 73 |
@@ -57,7 +58,7 @@ fi |
| 74 |
|
| 75 |
PATCHES=( |
| 76 |
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
| 77 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch |
| 78 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch |
| 79 |
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch |
| 80 |
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch |
| 81 |
) |
| 82 |
@@ -72,28 +73,18 @@ COMMON_DEPEND=" |
| 83 |
) |
| 84 |
>=sys-apps/sed-4 |
| 85 |
>=sys-apps/texinfo-4.7-r1 |
| 86 |
+ !dev-db/mariadb-connector-c[mysqlcompat] |
| 87 |
jemalloc? ( dev-libs/jemalloc:0= ) |
| 88 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 89 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 90 |
!yassl? ( |
| 91 |
- client-libs? ( |
| 92 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 93 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 94 |
- ) |
| 95 |
- !client-libs? ( |
| 96 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 97 |
- libressl? ( dev-libs/libressl:0= ) |
| 98 |
- ) |
| 99 |
- ) |
| 100 |
- client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 101 |
- net-libs/libnsl:0=[${MULTILIB_USEDEP}] |
| 102 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 103 |
- ) |
| 104 |
- !client-libs? ( >=sys-libs/zlib-1.2.3:0= |
| 105 |
- net-libs/libnsl:0= |
| 106 |
- kerberos? ( virtual/krb5 ) |
| 107 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 108 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 109 |
) |
| 110 |
+ >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 111 |
sys-libs/ncurses:0= |
| 112 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
| 113 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 114 |
!bindist? ( |
| 115 |
sys-libs/binutils-libs:0= |
| 116 |
>=sys-libs/readline-4.1:0= |
| 117 |
@@ -108,7 +99,6 @@ COMMON_DEPEND=" |
| 118 |
innodb-lz4? ( app-arch/lz4 ) |
| 119 |
innodb-lzo? ( dev-libs/lzo ) |
| 120 |
innodb-snappy? ( app-arch/snappy ) |
| 121 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
| 122 |
numa? ( sys-process/numactl ) |
| 123 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
| 124 |
pam? ( virtual/pam:0= ) |
| 125 |
@@ -123,7 +113,6 @@ DEPEND="virtual/yacc |
| 126 |
server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
| 127 |
${COMMON_DEPEND}" |
| 128 |
RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 129 |
- client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) |
| 130 |
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster |
| 131 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
| 132 |
!<virtual/mysql-5.6-r9 |
| 133 |
@@ -146,9 +135,9 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 134 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 135 |
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
| 136 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 137 |
- !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] ) |
| 138 |
- server? ( ~virtual/mysql-5.6[static=] |
| 139 |
- galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
| 140 |
+ server? ( ~virtual/mysql-5.6[embedded=,static=] ) |
| 141 |
+ virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=] |
| 142 |
+ server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
| 143 |
|
| 144 |
pkg_setup() { |
| 145 |
if [[ ${MERGE_TYPE} != binary ]] ; then |
| 146 |
@@ -250,6 +239,10 @@ pkg_postinst() { |
| 147 |
} |
| 148 |
|
| 149 |
src_unpack() { |
| 150 |
+ |
| 151 |
+ # Initialize the proper variables first |
| 152 |
+ mysql_init_vars |
| 153 |
+ |
| 154 |
unpack ${A} |
| 155 |
# Grab the patches |
| 156 |
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack |
| 157 |
@@ -272,10 +265,6 @@ src_prepare() { |
| 158 |
# There is no CMake flag, it simply checks for existance |
| 159 |
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" |
| 160 |
|
| 161 |
- if ! use server; then |
| 162 |
- rm -r "${S}"/plugin/handler_socket || die |
| 163 |
- fi |
| 164 |
- |
| 165 |
cmake-utils_src_prepare |
| 166 |
} |
| 167 |
|
| 168 |
@@ -290,20 +279,12 @@ src_configure(){ |
| 169 |
# bug #283926, with GCC4.4, this is required to get correct behavior. |
| 170 |
append-flags -fno-strict-aliasing |
| 171 |
|
| 172 |
- if use client-libs ; then |
| 173 |
- multilib-minimal_src_configure |
| 174 |
- else |
| 175 |
- multilib_src_configure |
| 176 |
- fi |
| 177 |
+ multilib-minimal_src_configure |
| 178 |
} |
| 179 |
|
| 180 |
multilib_src_configure() { |
| 181 |
debug-print-function ${FUNCNAME} "$@" |
| 182 |
|
| 183 |
- if ! multilib_is_native_abi && ! use client-libs ; then |
| 184 |
- return |
| 185 |
- fi |
| 186 |
- |
| 187 |
CMAKE_BUILD_TYPE="RelWithDebInfo" |
| 188 |
|
| 189 |
# debug hack wrt #497532 |
| 190 |
@@ -361,10 +342,6 @@ multilib_src_configure() { |
| 191 |
mycmakeargs+=( -DWITH_SSL=bundled ) |
| 192 |
fi |
| 193 |
|
| 194 |
- if ! use client-libs ; then |
| 195 |
- mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) |
| 196 |
- fi |
| 197 |
- |
| 198 |
# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION |
| 199 |
# systemtap only works on native ABI bug 530132 |
| 200 |
if multilib_is_native_abi; then |
| 201 |
@@ -458,7 +435,7 @@ multilib_src_configure() { |
| 202 |
-DMYSQL_USER=mysql |
| 203 |
-DDISABLE_SHARED=$(usex static YES NO) |
| 204 |
-DWITH_DEBUG=$(usex debug) |
| 205 |
- -DWITH_EMBEDDED_SERVER=OFF |
| 206 |
+ -DWITH_EMBEDDED_SERVER=$(usex embedded) |
| 207 |
-DWITH_PROFILING=$(usex profiling) |
| 208 |
) |
| 209 |
|
| 210 |
@@ -485,7 +462,7 @@ multilib_src_configure() { |
| 211 |
else |
| 212 |
mycmakeargs+=( |
| 213 |
-DWITHOUT_SERVER=1 |
| 214 |
- -DWITH_EMBEDDED_SERVER=OFF |
| 215 |
+ -DWITHOUT_EMBEDDED_SERVER=1 |
| 216 |
-DEXTRA_CHARSETS=none |
| 217 |
-DINSTALL_SQLBENCHDIR= |
| 218 |
-DWITH_SYSTEMD=no |
| 219 |
@@ -496,11 +473,7 @@ multilib_src_configure() { |
| 220 |
} |
| 221 |
|
| 222 |
src_compile() { |
| 223 |
- if use client-libs ; then |
| 224 |
- multilib-minimal_src_compile |
| 225 |
- else |
| 226 |
- multilib_src_compile |
| 227 |
- fi |
| 228 |
+ multilib-minimal_src_compile |
| 229 |
} |
| 230 |
|
| 231 |
multilib_src_compile() { |
| 232 |
@@ -508,33 +481,28 @@ multilib_src_compile() { |
| 233 |
} |
| 234 |
|
| 235 |
src_install() { |
| 236 |
- local MULTILIB_WRAPPED_HEADERS |
| 237 |
- local MULTILIB_CHOST_TOOLS |
| 238 |
- if use client-libs ; then |
| 239 |
- # headers with ABI specific data |
| 240 |
- MULTILIB_WRAPPED_HEADERS=( |
| 241 |
- /usr/include/mysql/server/my_config.h |
| 242 |
- /usr/include/mysql/server/private/embedded_priv.h |
| 243 |
- /usr/include/mysql/server/mysql_version.h |
| 244 |
- /usr/include/mariadb/mariadb_version.h |
| 245 |
- /usr/include/mysql/mariadb_version.h |
| 246 |
- /usr/include/mysql/server/private/probes_mysql_nodtrace.h |
| 247 |
- /usr/include/mysql/server/private/probes_mysql_dtrace.h ) |
| 248 |
- |
| 249 |
- # wrap the config scripts |
| 250 |
- MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config ) |
| 251 |
- multilib-minimal_src_install |
| 252 |
- else |
| 253 |
- multilib_src_install |
| 254 |
- multilib_src_install_all |
| 255 |
- fi |
| 256 |
+ # headers with ABI specific data |
| 257 |
+ local MULTILIB_WRAPPED_HEADERS=( |
| 258 |
+ /usr/include/mysql/server/my_config.h |
| 259 |
+ /usr/include/mysql/server/private/embedded_priv.h |
| 260 |
+ /usr/include/mysql/server/mysql_version.h |
| 261 |
+ /usr/include/mariadb/mariadb_version.h |
| 262 |
+ /usr/include/mysql/mariadb_version.h |
| 263 |
+ /usr/include/mysql/server/private/probes_mysql_nodtrace.h |
| 264 |
+ /usr/include/mysql/server/private/probes_mysql_dtrace.h ) |
| 265 |
+ |
| 266 |
+ # wrap the config scripts |
| 267 |
+ local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config ) |
| 268 |
+ multilib-minimal_src_install |
| 269 |
} |
| 270 |
|
| 271 |
# Intentionally override eclass function |
| 272 |
multilib_src_install() { |
| 273 |
- |
| 274 |
cmake-utils_src_install |
| 275 |
|
| 276 |
+ # Make sure the vars are correctly initialized |
| 277 |
+ mysql_init_vars |
| 278 |
+ |
| 279 |
# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used |
| 280 |
if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then |
| 281 |
rm "${ED}/usr/include/mysql/server/private/config.h" || die |
| 282 |
@@ -545,12 +513,10 @@ multilib_src_install() { |
| 283 |
doins "${S}"/sql/*.h |
| 284 |
fi |
| 285 |
|
| 286 |
- if use client-libs ; then |
| 287 |
# Install compatible symlinks to libmysqlclient |
| 288 |
# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a" |
| 289 |
# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so" |
| 290 |
dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" |
| 291 |
- fi |
| 292 |
|
| 293 |
# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. |
| 294 |
find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die |
| 295 |
@@ -631,7 +597,12 @@ multilib_src_install_all() { |
| 296 |
# FEATURES='test userpriv -usersandbox' \ |
| 297 |
# ebuild mariadb-X.X.XX.ebuild \ |
| 298 |
# digest clean package |
| 299 |
-src_test() { |
| 300 |
+multilib_src_test() { |
| 301 |
+ |
| 302 |
+ if ! multilib_is_native_abi ; then |
| 303 |
+ einfo "Server tests not available on non-native abi". |
| 304 |
+ return 0; |
| 305 |
+ fi |
| 306 |
|
| 307 |
_disable_test() { |
| 308 |
local rawtestname reason |
| 309 |
@@ -696,10 +667,6 @@ src_test() { |
| 310 |
_disable_test "$t" "False positives in Gentoo" |
| 311 |
done |
| 312 |
|
| 313 |
- if ! use client-libs ; then |
| 314 |
- _disable_test main.plugin_auth "Needs client libraries built" |
| 315 |
- fi |
| 316 |
- |
| 317 |
# run mysql-test tests |
| 318 |
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" |
| 319 |
retstatus_tests=$? |
| 320 |
@@ -850,11 +817,11 @@ pkg_config() { |
| 321 |
|
| 322 |
unset tmp_mysqld_password_source |
| 323 |
fi |
| 324 |
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" |
| 325 |
+ MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)" |
| 326 |
# These are dir+prefix |
| 327 |
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" |
| 328 |
+ MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)" |
| 329 |
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} |
| 330 |
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" |
| 331 |
+ MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)" |
| 332 |
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} |
| 333 |
|
| 334 |
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then |
| 335 |
|
| 336 |
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild |
| 337 |
similarity index 99% |
| 338 |
copy from dev-db/mariadb/mariadb-10.2.14.ebuild |
| 339 |
copy to dev-db/mariadb/mariadb-10.2.13.ebuild |
| 340 |
index 90f70d1e201..2eff8c74630 100644 |
| 341 |
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild |
| 342 |
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild |
| 343 |
@@ -60,6 +60,8 @@ PATCHES=( |
| 344 |
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch |
| 345 |
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch |
| 346 |
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch |
| 347 |
+ "${MY_PATCH_DIR}"/20032_all_mariadb-10.2.12-fix-address-resolve.patch |
| 348 |
+ "${MY_PATCH_DIR}"/20033_all_mariadb-10.1.31-xtradb-sst.patch |
| 349 |
) |
| 350 |
|
| 351 |
# Be warned, *DEPEND are version-dependant |
| 352 |
@@ -86,13 +88,9 @@ COMMON_DEPEND=" |
| 353 |
) |
| 354 |
) |
| 355 |
client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 356 |
- net-libs/libnsl:0=[${MULTILIB_USEDEP}] |
| 357 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 358 |
) |
| 359 |
- !client-libs? ( >=sys-libs/zlib-1.2.3:0= |
| 360 |
- net-libs/libnsl:0= |
| 361 |
- kerberos? ( virtual/krb5 ) |
| 362 |
- ) |
| 363 |
+ !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) ) |
| 364 |
sys-libs/ncurses:0= |
| 365 |
!bindist? ( |
| 366 |
sys-libs/binutils-libs:0= |
| 367 |
|
| 368 |
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild |
| 369 |
index 90f70d1e201..3c62b609a1e 100644 |
| 370 |
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild |
| 371 |
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild |
| 372 |
@@ -86,13 +86,9 @@ COMMON_DEPEND=" |
| 373 |
) |
| 374 |
) |
| 375 |
client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 376 |
- net-libs/libnsl:0=[${MULTILIB_USEDEP}] |
| 377 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 378 |
) |
| 379 |
- !client-libs? ( >=sys-libs/zlib-1.2.3:0= |
| 380 |
- net-libs/libnsl:0= |
| 381 |
- kerberos? ( virtual/krb5 ) |
| 382 |
- ) |
| 383 |
+ !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) ) |
| 384 |
sys-libs/ncurses:0= |
| 385 |
!bindist? ( |
| 386 |
sys-libs/binutils-libs:0= |
| 387 |
|
| 388 |
diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 389 |
index 0575417da24..69e55e88ddc 100644 |
| 390 |
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 391 |
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 392 |
@@ -81,24 +81,13 @@ COMMON_DEPEND=" |
| 393 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 394 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 395 |
!yassl? ( |
| 396 |
- client-libs? ( |
| 397 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 398 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 399 |
- ) |
| 400 |
- !client-libs? ( |
| 401 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 402 |
- libressl? ( dev-libs/libressl:0= ) |
| 403 |
- ) |
| 404 |
- ) |
| 405 |
- client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 406 |
- net-libs/libnsl:0=[${MULTILIB_USEDEP}] |
| 407 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 408 |
- ) |
| 409 |
- !client-libs? ( >=sys-libs/zlib-1.2.3:0= |
| 410 |
- net-libs/libnsl:0= |
| 411 |
- kerberos? ( virtual/krb5 ) |
| 412 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 413 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 414 |
) |
| 415 |
+ >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 416 |
sys-libs/ncurses:0= |
| 417 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
| 418 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 419 |
!bindist? ( |
| 420 |
sys-libs/binutils-libs:0= |
| 421 |
>=sys-libs/readline-4.1:0= |
| 422 |
@@ -113,7 +102,6 @@ COMMON_DEPEND=" |
| 423 |
innodb-lz4? ( app-arch/lz4 ) |
| 424 |
innodb-lzo? ( dev-libs/lzo ) |
| 425 |
innodb-snappy? ( app-arch/snappy ) |
| 426 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
| 427 |
numa? ( sys-process/numactl ) |
| 428 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
| 429 |
pam? ( virtual/pam:0= ) |
| 430 |
@@ -151,7 +139,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 431 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 432 |
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
| 433 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 434 |
- !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] ) |
| 435 |
+ !client-libs? ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) |
| 436 |
server? ( ~virtual/mysql-5.6[static=] |
| 437 |
galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
Archives