From 117ed33b53961e74666b5aca7140fb41d7494f2a Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Tue, 24 Apr 2018 19:52:07 -0400 Subject: [PATCH] dev-db/mysql: Fix USE=-server on 5.7.22 Package-Manager: Portage-2.3.31, Repoman-2.3.9 --- dev-db/mysql/mysql-5.7.22.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild index 5e447c166666..c833881e7bc3 100644 --- a/dev-db/mysql/mysql-5.7.22.ebuild +++ b/dev-db/mysql/mysql-5.7.22.ebuild @@ -207,6 +207,8 @@ src_prepare() { "${S}/cmake/ssl.cmake" || die fi + sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die + cmake-utils_src_prepare } @@ -273,6 +275,7 @@ multilib_src_configure() { -DWITH_RAPID=OFF -DWITH_LIBEVENT=NO -DWITH_CURL=system + -DWITH_BOOST="${S}/boost" ) if use test ; then mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) @@ -307,7 +310,6 @@ multilib_src_configure() { if multilib_is_native_abi && use server ; then mycmakeargs+=( - -DWITH_BOOST="${S}/boost" -DWITH_LZ4=system -DWITH_NUMA=$(usex numa ON OFF) ) -- 2.26.2