commit: fb26a753c96724325cfde27e5b717c23181ea3e5
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 14:24:42 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 14:52:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb26a753
mysql-multilib.eclass: Add systemd support for >=dev-db/mariadb-10.1.8
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
eclass/mysql-multilib.eclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index f761434..7022326 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -27,7 +27,7 @@ MYSQL_EXTRAS=""
# Use "none" to disable it's use
[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx
versionator \
toolchain-funcs user cmake-utils multilib-minimal
#
@@ -643,8 +643,13 @@ multilib_src_configure() {
-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR=$(systemd_get_unitdir)
)
+ if in_iuse systemd ; then
+ mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+ fi
+
if use openssl || use libressl ; then
mycmakeargs+=( -DWITH_SSL=system )
else