diff options
author | 2014-04-28 14:10:06 -0400 | |
---|---|---|
committer | 2014-04-28 14:10:06 -0400 | |
commit | de8b563fc1c80a130f34f76faa0bc8837b2d158b (patch) | |
tree | 6e89af2a326c1e47e83386ce8cd16445d2ef486b | |
parent | [eclass] Convert multilib_build_binaries to multilib_is_native_abi (diff) | |
download | mysql-de8b563fc1c80a130f34f76faa0bc8837b2d158b.tar.gz mysql-de8b563fc1c80a130f34f76faa0bc8837b2d158b.tar.bz2 mysql-de8b563fc1c80a130f34f76faa0bc8837b2d158b.zip |
[eclass] clean up dep for MariaDB 10
Signed-off-by: Brian Evans <grknight@tuffmail.com>
-rw-r--r-- | eclass/mysql-multilib.eclass | 1 | ||||
-rw-r--r-- | eclass/mysql-v2.eclass | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 1815e75..28df036 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -240,7 +240,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \ DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi fi diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 1830130..15faf6c 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -274,8 +274,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" fi fi |