summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2017-02-22 11:26:39 -0500
committerBrian Evans <grknight@gentoo.org>2017-02-22 11:26:39 -0500
commitb5944645a6fd8b8dc9eb3c6e4a90176b582f0467 (patch)
tree24a216b86e05dd4f5c4e617d6af9f4a7c8ddb497 /eclass
parentdev-python/hacking: x86 stable wrt bug #606078 (diff)
downloadgentoo-b5944645a6fd8b8dc9eb3c6e4a90176b582f0467.tar.gz
gentoo-b5944645a6fd8b8dc9eb3c6e4a90176b582f0467.tar.bz2
gentoo-b5944645a6fd8b8dc9eb3c6e4a90176b582f0467.zip
mysql*.eclass: remove built_with_use function in pkg_config
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql-multilib-r1.eclass2
-rw-r--r--eclass/mysql-multilib.eclass10
-rw-r--r--eclass/mysql-v2.eclass2
3 files changed, 4 insertions, 10 deletions
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index b787542745d..38fcc7c0ecf 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -785,7 +785,7 @@ mysql-multilib-r1_pkg_config() {
mysql_init_vars
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if ! built_with_use ${CATEGORY}/${PN} server ; then
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
die "Minimal builds do NOT include the MySQL server"
fi
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b2e7dffa09a..b19b0fa522e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -943,14 +943,8 @@ mysql-multilib_pkg_config() {
mysql_init_vars
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ${HAS_TOOLS_PATCH} ]] ; then
- if ! built_with_use ${CATEGORY}/${PN} server ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
- else
- if built_with_use ${CATEGORY}/${PN} minimal ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
fi
if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 556d37eba6e..ddb28654b49 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -699,7 +699,7 @@ mysql-v2_pkg_config() {
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if built_with_use ${CATEGORY}/${PN} minimal ; then
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
die "Minimal builds do NOT include the MySQL server"
fi