| 1 |
commit: b8cea59cc20e7899a571d13e15d9e8e68ccae49d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 9 02:18:56 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 9 02:18:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cea59c |
| 7 |
|
| 8 |
mysql-multilib-r1.eclass: Only detect systemd-notify for native ABI and server USE |
| 9 |
|
| 10 |
eclass/mysql-multilib-r1.eclass | 11 +++++++---- |
| 11 |
1 file changed, 7 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 14 |
index 8981e0b510a..eea8e42f153 100644 |
| 15 |
--- a/eclass/mysql-multilib-r1.eclass |
| 16 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 17 |
@@ -414,10 +414,6 @@ multilib_src_configure() { |
| 18 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) |
| 19 |
fi |
| 20 |
|
| 21 |
- if in_iuse systemd ; then |
| 22 |
- mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) |
| 23 |
- fi |
| 24 |
- |
| 25 |
if use openssl || use libressl ; then |
| 26 |
mycmakeargs+=( -DWITH_SSL=system ) |
| 27 |
else |
| 28 |
@@ -447,6 +443,12 @@ multilib_src_configure() { |
| 29 |
mycmakeargs+=( -DWITH_EDITLINE=bundled ) |
| 30 |
|
| 31 |
if multilib_is_native_abi && use server ; then |
| 32 |
+ |
| 33 |
+ # systemd is only linked to for server notification |
| 34 |
+ if in_iuse systemd ; then |
| 35 |
+ mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) |
| 36 |
+ fi |
| 37 |
+ |
| 38 |
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then |
| 39 |
ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" |
| 40 |
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." |
| 41 |
@@ -505,6 +507,7 @@ multilib_src_configure() { |
| 42 |
-DWITHOUT_EMBEDDED_SERVER=1 |
| 43 |
-DEXTRA_CHARSETS=none |
| 44 |
-DINSTALL_SQLBENCHDIR= |
| 45 |
+ -DWITH_SYSTEMD=NO |
| 46 |
) |
| 47 |
fi |
Archives