| 1 |
commit: 37df9dff3c8bdd99ec577220d564e24b56ab206d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 9 02:01:11 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 9 02:01:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=37df9dff |
| 7 |
|
| 8 |
Fix systemd detection in 10.2.6 |
| 9 |
|
| 10 |
dev-db/mariadb/mariadb-10.2.6.ebuild | 2 +- |
| 11 |
eclass/mysql-multilib-r1.eclass | 10 ++++++---- |
| 12 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 15 |
index d719edc..e09b344 100644 |
| 16 |
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 17 |
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 18 |
@@ -42,7 +42,6 @@ PATCHES=( |
| 19 |
COMMON_DEPEND=" |
| 20 |
mroonga? ( app-text/groonga-normalizer-mysql ) |
| 21 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 22 |
- systemd? ( sys-apps/systemd:= ) |
| 23 |
!bindist? ( |
| 24 |
sys-libs/binutils-libs:0= |
| 25 |
>=sys-libs/readline-4.1:0= |
| 26 |
@@ -59,6 +58,7 @@ COMMON_DEPEND=" |
| 27 |
innodb-snappy? ( app-arch/snappy ) |
| 28 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
| 29 |
pam? ( virtual/pam:0= ) |
| 30 |
+ systemd? ( sys-apps/systemd:= ) |
| 31 |
tokudb? ( app-arch/snappy ) |
| 32 |
) |
| 33 |
>=dev-libs/libpcre-8.35:3= |
| 34 |
|
| 35 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 36 |
index c6ac253..8b604f2 100644 |
| 37 |
--- a/eclass/mysql-multilib-r1.eclass |
| 38 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 39 |
@@ -420,10 +420,6 @@ multilib_src_configure() { |
| 40 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) |
| 41 |
fi |
| 42 |
|
| 43 |
- if in_iuse systemd ; then |
| 44 |
- mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) |
| 45 |
- fi |
| 46 |
- |
| 47 |
if use openssl || use libressl ; then |
| 48 |
mycmakeargs+=( -DWITH_SSL=system ) |
| 49 |
else |
| 50 |
@@ -453,6 +449,11 @@ multilib_src_configure() { |
| 51 |
mycmakeargs+=( -DWITH_EDITLINE=bundled ) |
| 52 |
|
| 53 |
if multilib_is_native_abi && use server ; then |
| 54 |
+ |
| 55 |
+ if in_iuse systemd ; then |
| 56 |
+ mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) |
| 57 |
+ fi |
| 58 |
+ |
| 59 |
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then |
| 60 |
ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" |
| 61 |
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." |
| 62 |
@@ -511,6 +512,7 @@ multilib_src_configure() { |
| 63 |
-DWITHOUT_EMBEDDED_SERVER=1 |
| 64 |
-DEXTRA_CHARSETS=none |
| 65 |
-DINSTALL_SQLBENCHDIR= |
| 66 |
+ -DWITH_SYSTEMD=NO |
| 67 |
) |
| 68 |
fi |
Archives