diff options
| author |   layman <layman@localhost> | 2015-06-25 10:25:04 -0400 |
|---|---|---|
| committer | layman <layman@localhost> | 2015-06-25 10:25:04 -0400 |
| commit | cda61c8ce44038cb1b9685098b99762ee97d0a4f (patch) | |
| tree | 9432976984aa6c6911e5c3887d84e73212aad85b | |
| parent | client-libs, server and tools now build ; Need to tweak things like shared fi... (diff) | |
| download | mysql-cda61c8ce44038cb1b9685098b99762ee97d0a4f.tar.gz mysql-cda61c8ce44038cb1b9685098b99762ee97d0a4f.tar.bz2 mysql-cda61c8ce44038cb1b9685098b99762ee97d0a4f.zip | |
Fix dependencies
| -rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 10 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild index 289f2d6..771a07b 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild @@ -26,12 +26,12 @@ CDEPEND=" ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) " RDEPEND="${CDEPEND} - !dev-db/mysql - !dev-db/mysql-cluster - !dev-db/mariadb + !dev-db/mysql[client-libs(+)] + !dev-db/mysql-cluster[client-libs(+)] + !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] - !dev-db/mariadb-galera - !dev-db/percona-server + !dev-db/mariadb-galera[client-libs(+)] + !dev-db/percona-server[client-libs(+)] " DEPEND="${CDEPEND} >=dev-util/cmake-2.8.9 diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 175f455..a786828 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -370,9 +370,9 @@ RDEPEND="${DEPEND} " if [[ ${HAS_TOOLS_PATCH} ]] ; then - RDEPEND="${RDEPEND} + RDEPEND="${RDEPEND} server? ( !prefix? ( dev-db/mysql-init-scripts ) ) - !client-libs? ( virtual/libmysqclient )" + !client-libs? ( virtual/libmysqlclient )" else RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )" fi |