[gentoo-commits] repo/gentoo:master commit in: eclass/

[Brian Evans]

commit:     b8cea59cc20e7899a571d13e15d9e8e68ccae49d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 02:18:56 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 02:18:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cea59c

mysql-multilib-r1.eclass: Only detect systemd-notify for native ABI and server 
USE

 eclass/mysql-multilib-r1.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 8981e0b510a..eea8e42f153 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -414,10 +414,6 @@ multilib_src_configure() {
                mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
        fi
 
-       if in_iuse systemd ; then
-               mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
-       fi
-
        if use openssl || use libressl ; then
                mycmakeargs+=( -DWITH_SSL=system )
        else
@@ -447,6 +443,12 @@ multilib_src_configure() {
        mycmakeargs+=( -DWITH_EDITLINE=bundled )
 
        if multilib_is_native_abi && use server ; then
+
+               # systemd is only linked to for server notification
+               if in_iuse systemd ; then
+                       mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+               fi
+
                if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
                        ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
                        ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
@@ -505,6 +507,7 @@ multilib_src_configure() {
                        -DWITHOUT_EMBEDDED_SERVER=1
                        -DEXTRA_CHARSETS=none
                        -DINSTALL_SQLBENCHDIR=
+                       -DWITH_SYSTEMD=NO
                )
        fi