* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, dev-db/mariadb/, eclass/
@ 2014-01-06 19:06 Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2014-01-06 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 7224e86422af33a09b2bd773e0d7b673a32a81a7
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Dec 30 21:29:55 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Dec 30 21:29:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7224e864
[mariadb] Version bump for 10.0 series
---
dev-db/mariadb/ChangeLog | 10 ++++++++--
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/files/my.cnf-5.5 | 5 +++++
...mariadb-10.0.4.ebuild => mariadb-10.0.7.ebuild} | 9 +++++----
eclass/mysql-v2.eclass | 23 +++++++++++++++-------
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 9fce537..6a9d494 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.0.7 (30 Dec 2013)
+
+ 30 Dec 2013; Brian Evans <grknight@tuffmail.com> files/my.cnf-5.5,
+ -mariadb-10.0.4.ebuild, +mariadb-10.0.7.ebuild:
+ [mariadb] Version bump for 10 series
+
*mariadb-5.5.34 (22 Nov 2013)
22 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.34.ebuild:
@@ -43,7 +49,7 @@
*mariadb-5.5.32 (19 Jul 2013)
- 19 Jul 2013; Brian Evans <grknight@lavabit.com> +mariadb-5.5.32.ebuild:
+ 19 Jul 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.32.ebuild:
Version bump
*mariadb-10.0.3 (12 Jun 2013)
@@ -224,4 +230,4 @@
15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-4.1,
+mariadb-5.1.42.ebuild, +metadata.xml:
Add MariaDB. Bug #303130, based on the submission by Brian Evans
- <grknight@scent-team.com>.
+ <grknight@tuffmail.com>.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 96885c8..54d9862 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
-DIST mariadb-10.0.4.tar.gz 31104543 SHA256 f04fa28452cf27ea5ce9fb443a407a233402831559c258dd81caa4908be72af9 SHA512 337b1801a12aa29b65025436b41fb1857f1deca85825dde72cc8f30e5e24ce62ad702125bb41d95316d2b096f88a32e18649bfa57b077acba7b57d93a5b0b398 WHIRLPOOL f6c8c7d23853b1b41d53b5a1dd4381d6d4c30aabf7699fe4a5dd0530cb8782ab7f82960ae049ee52dfe16946c42b0019570ba39a9ef83b764a3b1052afa8f6f8
DIST mariadb-10.0.6.tar.gz 50375294 SHA256 da382b3acf90b05f5bdc1e4a7cd57e9903182d8247f1f48c4d5afe9e4211c174 SHA512 97a86c0611a5ae4e8ea28b4879f67682d5100db9e2f9340e7e2aad60e638e9f34164740c4259cf0c2bb701aef0b80181fea1923e8401e61039c159783db8cfcf WHIRLPOOL c3ec49d5106ac0bc011275a944acba93ecec9c3e37f01f0e1be73f133405d213423a5d3c1619986fa60d6272bf39e4a29bc4f464d4a2205e0a526e477a6387a3
+DIST mariadb-10.0.7.tar.gz 51365829 SHA256 71422d8106c038fa4723e6e040fa149030e193545078402f661d793f81e3fe7b SHA512 e5e827ae42594a9b071bc01864a3ab3de2e873baeacb4364e08e4e27e7dc6214fa63e481cf0521426b9a2b0899311ff8cc95682cf3dd5161c466a290921b8314 WHIRLPOOL 740453867f03286687e0ad381793e5c254285a574398a2f2003993fa554e077d1ef2b126d90ea47e39e99bb298a1f9e495ada1b99adfb82c5531dcfe8cfc0d31
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
index 195ff90..72d81c5 100644
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -151,3 +151,8 @@ write_buffer = 2M
[mysqlhotcopy]
interactive-timeout
+[mariadb]
+# Uncomment these to get XtraDB engine support in 10.0.7+
+#ignore-builtin-innodb
+#plugin-load=ha_xtradb.so
+
diff --git a/dev-db/mariadb/mariadb-10.0.4.ebuild b/dev-db/mariadb/mariadb-10.0.7.ebuild
similarity index 95%
rename from dev-db/mariadb/mariadb-10.0.4.ebuild
rename to dev-db/mariadb/mariadb-10.0.7.ebuild
index 262e97b..939a4ca 100644
--- a/dev-db/mariadb/mariadb-10.0.4.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.7.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
+MY_EXTRAS_VER="live"
# Build system
BUILD="cmake"
@@ -28,7 +28,7 @@ RDEPEND="${RDEPEND}"
# digest clean package
src_test() {
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -98,7 +98,8 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 043cc49..d6ebe6b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -263,6 +263,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
# Bug 441700 MariaDB >=5.3 include custom mytop
mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+ mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
fi
# Having different flavours at the same time is not a good idea
@@ -573,13 +574,21 @@ mysql-v2_pkg_postinst() {
fi
done
- if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] \
- && mysql_version_is_at_least "5.2.10" && use pam ; then
- einfo
- elog "This install includes the PAM authentication plugin."
- elog "To activate and configure the PAM plugin, please read:"
- elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
- einfo
+ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+ if mysql_version_is_at_least "5.2.10" && use pam ; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if mysql_version_is_at_least "10.0.7" ; then
+ einfo
+ elog "In 10.0, XtraDB is no longer the default InnoDB implementation."
+ elog "It is installed as a dynamic plugin and must be activated in my.cnf."
+ einfo
+ fi
fi
einfo
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, dev-db/mariadb/, eclass/
@ 2014-03-11 0:18 Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2014-03-11 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 9e3a327374cf111fdfd0234083b131c4729ea848
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Mar 11 00:18:22 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar 11 00:18:22 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9e3a3273
Version bump to mariadb 10.0.9 and eclass updates
---
dev-db/mariadb/Manifest | 3 +--
dev-db/mariadb/files/my.cnf-5.5 | 4 ----
...iadb-10.0.8.ebuild => mariadb-10.0.9_rc.ebuild} | 0
eclass/mysql-cmake.eclass | 2 ++
eclass/mysql-multilib.eclass | 26 +++++++++++-----------
eclass/mysql-v2.eclass | 24 ++++++++++----------
6 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1623cb0..0c3263f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,6 @@
-DIST mariadb-10.0.8.tar.gz 51547358 SHA256 1240012d6c39fcb0dbd19f0697b833da3a612c8be802accb89cee6e369c4a7a8 SHA512 8d86a474cf6998a9e1c3c5c6ccb651d401652ce176e53c681fe02c12627089e0c29f5b786f351ce0b3c02ac200b11d82c0ad1de7e06a861579991fda13c07ae9 WHIRLPOOL fe703662c6914d7f91069e6776d00093dd34c32144d8a91c1614cddf309590bbe3c9e6613cdaadacd7d45e51a1ec90ba7f96a99c1a0811d8370d926e856afb56
+DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512 2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064 WHIRLPOOL 0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.36.tar.gz 45767693 SHA256 16f2cc9c219b4fbe0b3e97f14d1ed6fd8b7d377b22b95f31adae91965e36bb0c SHA512 b7de14f4d4a08f51aae339779c59798f3ed110aa3d65038c39514161ee73b6cc95f95fe1b15434daf33de689b0d7351cbf7a1c90ca980f0f020b085ef23aa016 WHIRLPOOL 439e10efedf90f0a66e2e166728ade1e7112049802ac76fc83a5dd64a62daadbad1eb91d437f71ab36b5e2a6f5a0911cd6625b9b726c831057b44b38bf482593
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
index 31c3b9e..42ebd39 100644
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -148,7 +148,3 @@ write_buffer_size = 2M
interactive-timeout
[mariadb]
-# Uncomment these to get XtraDB engine support in 10.0.7+
-#ignore-builtin-innodb
-#plugin-load=ha_xtradb.so
-
diff --git a/dev-db/mariadb/mariadb-10.0.8.ebuild b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-10.0.8.ebuild
rename to dev-db/mariadb/mariadb-10.0.9_rc.ebuild
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a568bef..7fd992e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -329,6 +329,8 @@ mysql-cmake_src_configure() {
else
mycmakeargs+=( -DWITH_JEMALLOC=no )
fi
+ # TODO: uncomment this when libpcre 8.35 is released to remove bundled library
+# mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
fi
configure_cmake_locale
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index f699cc2..207ddc7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -105,7 +105,9 @@ mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with
if [[ -z ${SERVER_URI} ]]; then
[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
- MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
+ # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
+ mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
+ MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
SERVER_URI="
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
@@ -188,7 +190,7 @@ if [[ ${PN} == "percona-server" ]]; then
fi
REQUIRED_USE="
- ${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) embedded? ( static-libs )
+ ${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
#
@@ -199,7 +201,7 @@ REQUIRED_USE="
# These are used for both runtime and compiletime
# MULTILIB_USEDEP only set for libraries used by the client library
DEPEND="
- ssl? ( >=dev-libs/openssl-1.0.0:0=
+ ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?]
)
kernel_linux? (
sys-process/procps:0=
@@ -210,7 +212,7 @@ DEPEND="
) )
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
- >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
!dev-db/mariadb-native-client[mysqlcompat]
jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
tcmalloc? ( dev-util/google-perftools:0= )
@@ -238,6 +240,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
"
fi
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
+ # TODO: uncomment this when libpcre 8.35 is released to remove bundled library
+# if mysql_version_is_at_least "10.0.9" ; then
+# use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs?]" || \
+# DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
+# fi
fi
# Having different flavours at the same time is not a good idea
@@ -433,14 +440,14 @@ mysql-multilib_src_configure() {
# Adds a warning about redistribution to configure
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
- fi
- if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
if use jemalloc ; then
mycmakeargs+=( -DWITH_JEMALLOC="system" )
else
mycmakeargs+=( -DWITH_JEMALLOC=no )
fi
+ # TODO: uncomment this when libpcre 8.35 is released to remove bundled library
+# mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
fi
configure_cmake_locale
@@ -590,13 +597,6 @@ mysql-multilib_pkg_postinst() {
elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
einfo
fi
-
- if mysql_version_is_at_least "10.0.7" ; then
- einfo
- elog "In 10.0, XtraDB is no longer the default InnoDB implementation."
- elog "It is installed as a dynamic plugin and must be activated in my.cnf."
- einfo
- fi
fi
einfo
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index eee9242..0b9d267 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -125,7 +125,9 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with
if [[ -z ${SERVER_URI} ]]; then
[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
- MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
+ # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
+ mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
+ MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
SERVER_URI="
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
@@ -220,7 +222,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
fi
if mysql_version_is_at_least "5.5"; then
- REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) embedded? ( static-libs )"
+ REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
IUSE="${IUSE} jemalloc tcmalloc"
fi
@@ -241,11 +243,11 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) stati
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
DEPEND="
- ssl? ( >=dev-libs/openssl-0.9.6d )
+ ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
kernel_linux? ( sys-process/procps )
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
- >=sys-libs/zlib-1.2.3
+ >=sys-libs/zlib-1.2.3[static-libs?]
!dev-db/mariadb-native-client[mysqlcompat]
"
@@ -270,6 +272,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
"
fi
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
+ # TODO: uncomment this when libpcre 8.35 is released to remove bundled library
+# if mysql_version_is_at_least "10.0.9" ; then
+# use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs?]" || \
+# DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
+# fi
fi
# Having different flavours at the same time is not a good idea
@@ -279,7 +286,7 @@ for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; d
done
if mysql_version_is_at_least "5.5" ; then
- DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
+ DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] )"
DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
fi
@@ -581,13 +588,6 @@ mysql-v2_pkg_postinst() {
elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
einfo
fi
-
- if mysql_version_is_at_least "10.0.7" ; then
- einfo
- elog "In 10.0, XtraDB is no longer the default InnoDB implementation."
- elog "It is installed as a dynamic plugin and must be activated in my.cnf."
- einfo
- fi
fi
einfo
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-11 0:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-11 0:18 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, dev-db/mariadb/, eclass/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2014-01-06 19:06 Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox