diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-02-13 00:40:57 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-02-13 00:40:57 +0000 |
| commit | a9fa73ba3cc84b4e28b907fc0ccf0345e484550c (patch) | |
| tree | fcd9f1c2f8b993679b88d2feed706854fc0d595b /eclass/mysql-cmake.eclass | |
| parent | Fix building with USE=lua and dev-util/pkgconfig-0.28 (bug #456810 by Juergen... (diff) | |
| download | gentoo-2-a9fa73ba3cc84b4e28b907fc0ccf0345e484550c.tar.gz gentoo-2-a9fa73ba3cc84b4e28b907fc0ccf0345e484550c.tar.bz2 gentoo-2-a9fa73ba3cc84b4e28b907fc0ccf0345e484550c.zip | |
Bug #455462: Libtool cleanup; Bug #455016: mariadb mytop deps; Bug #448598: USE=pam support.
Diffstat (limited to 'eclass/mysql-cmake.eclass')
| -rw-r--r-- | eclass/mysql-cmake.eclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 06124b3ec7b0..955e2878f357 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.14 2013/02/13 00:40:57 robbat2 Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -185,6 +185,11 @@ configure_cmake_standard() { $(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE) $(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE) ) + + if ! use pam ; then + mycmakeargs+=( -DAUTH_PAM_DISABLED=1 ) + fi + fi } @@ -388,4 +393,8 @@ mysql-cmake_src_install() { fi mysql_lib_symlinks "${ED}" + + #Remove mytop if perl is not selected + [[ "${PN}" == "mariadb" ]] && ! use perl \ + && rm -f "${ED}/usr/bin/mytop" } |