| 1 |
commit: 575e5ab98beafd988af73a49c43fdf36872ac6bc |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 26 16:48:00 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 16:48:00 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=575e5ab9 |
| 7 |
|
| 8 |
Add in minor fixes from portage tree |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/mysql-multilib.eclass | 4 +--- |
| 13 |
1 file changed, 1 insertion(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 16 |
index 10444a1..8810a04 100644 |
| 17 |
--- a/eclass/mysql-multilib.eclass |
| 18 |
+++ b/eclass/mysql-multilib.eclass |
| 19 |
@@ -273,8 +273,6 @@ REQUIRED_USE=" |
| 20 |
# These are used for both runtime and compiletime |
| 21 |
# MULTILIB_USEDEP only set for libraries used by the client library |
| 22 |
DEPEND=" |
| 23 |
- openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 24 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 25 |
kernel_linux? ( |
| 26 |
sys-process/procps:0= |
| 27 |
dev-libs/libaio:0= |
| 28 |
@@ -645,7 +643,7 @@ multilib_src_configure() { |
| 29 |
-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock |
| 30 |
-DWITH_DEFAULT_COMPILER_OPTIONS=0 |
| 31 |
-DWITH_DEFAULT_FEATURE_SET=0 |
| 32 |
- -DINSTALL_SYSTEMD_UNITDIR=$(systemd_get_unitdir) |
| 33 |
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)" |
| 34 |
) |
| 35 |
|
| 36 |
if in_iuse systemd ; then |
Archives