summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-10-20 10:24:42 -0400
committerBrian Evans <grknight@gentoo.org>2015-10-20 10:52:15 -0400
commitfb26a753c96724325cfde27e5b717c23181ea3e5 (patch)
tree879a40c81e5dbb935fd6129d033071f3764d1b54 /eclass/mysql-multilib.eclass
parentmysql-multilib.eclass: Add LibreSSL support (diff)
downloadgentoo-fb26a753c96724325cfde27e5b717c23181ea3e5.tar.gz
gentoo-fb26a753c96724325cfde27e5b717c23181ea3e5.tar.bz2
gentoo-fb26a753c96724325cfde27e5b717c23181ea3e5.zip
mysql-multilib.eclass: Add systemd support for >=dev-db/mariadb-10.1.8
Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'eclass/mysql-multilib.eclass')
-rw-r--r--eclass/mysql-multilib.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index f76143471ed8..702232621965 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