commit: 37df9dff3c8bdd99ec577220d564e24b56ab206d Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Sun Jul 9 02:01:11 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Sun Jul 9 02:01:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=37df9dff
Fix systemd detection in 10.2.6 dev-db/mariadb/mariadb-10.2.6.ebuild | 2 +- eclass/mysql-multilib-r1.eclass | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild index d719edc..e09b344 100644 --- a/dev-db/mariadb/mariadb-10.2.6.ebuild +++ b/dev-db/mariadb/mariadb-10.2.6.ebuild @@ -42,7 +42,6 @@ PATCHES=( COMMON_DEPEND=" mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= @@ -59,6 +58,7 @@ COMMON_DEPEND=" innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) + systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index c6ac253..8b604f2 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -420,10 +420,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 @@ -453,6 +449,11 @@ multilib_src_configure() { mycmakeargs+=( -DWITH_EDITLINE=bundled ) if multilib_is_native_abi && use server ; then + + 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}." @@ -511,6 +512,7 @@ multilib_src_configure() { -DWITHOUT_EMBEDDED_SERVER=1 -DEXTRA_CHARSETS=none -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=NO ) fi