commit: 7f42ea9df4201819e43855eea10fb9ebb15c8649
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 18 19:46:07 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jun 18 19:46:07 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7f42ea9d
[eclass] Add IUSE='bindist' for bug 513710. Needs more testing
---
eclass/mysql-cmake.eclass | 11 ++++++-----
eclass/mysql-multilib.eclass | 17 +++++++++++------
eclass/mysql-v2.eclass | 11 ++++++++++-
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a80680a..908e66e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -301,7 +301,6 @@ mysql-cmake_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT="Gentoo Linux ${PF}"
$(cmake-utils_use_with test UNIT_TESTS)
- -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -312,14 +311,16 @@ mysql-cmake_src_configure() {
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] &&
mysql_version_is_at_least "5.6.12" ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+ else
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ $(usex bindist -DHAVE_BFD_H=0 '')
+ )
fi
- # Bug 412851
- # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3
readline linked
- # Adds a warning about redistribution to configure
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mycmakeargs+=(
- -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
mysql_version_is_at_least "10.0.9" && mycmakeargs+=(
-DWITH_PCRE=system )
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index feb9ba5..fa2ab52 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,6 +178,10 @@ SLOT="0"
IUSE="+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ||
mysql_check_version_range "5.5.38 to 5.6.11.99" ; then
+ IUSE="bindist ${IUSE}"
+fi
+
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
IUSE="${IUSE} oqgraph pam sphinx tokudb"
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or
perfomance suffers
@@ -220,7 +224,7 @@ DEPEND="
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] &&
mysql_version_is_at_least "5.6.12" ; then
DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
else
- DEPEND="${DEPEND} >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]"
+ DEPEND="${DEPEND} !bindist? (
>=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
@@ -417,7 +421,6 @@ multilib_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT="Gentoo Linux ${PF}"
$(cmake-utils_use_with test UNIT_TESTS)
- -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -428,15 +431,17 @@ multilib_src_configure() {
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] &&
mysql_version_is_at_least "5.6.12" ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+ else
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ $(usex bindist -DHAVE_BFD_H=0)
+ )
fi
- # Bug 412851
- # MariaDB requires this flag to compile with GPLv3 readline linked
- # Adds a warning about redistribution to configure
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mycmakeargs+=(
- -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f0c919a..9c4e8fa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -209,6 +209,11 @@ esac
# Common IUSE
IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
+ mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.38 to
5.6.11.99" ; then
+ IUSE="bindist ${IUSE}"
+fi
+
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
@@ -258,7 +263,11 @@ DEPEND="
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] &&
mysql_version_is_at_least "5.6.12" ; then
DEPEND="${DEPEND} dev-libs/libedit"
else
- DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+ if mysql_version_is_at_least "5.5" ; then
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )"
+ else
+ DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+ fi
fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
