commit: 8a8dbdfdaac4233506946089191c2954a3275384
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 31 20:24:25 2014 +0000
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Thu Jul 31 20:24:25 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8a8dbdfd
Remove mysql injected features and C(XX)FLAGS
---
eclass/mysql-cmake.eclass | 2 ++
eclass/mysql-multilib.eclass | 3 +++
2 files changed, 5 insertions(+)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 8360ded..925cdc5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -317,6 +317,8 @@ mysql-cmake_src_configure() {
-DENABLED_LOCAL_INFILE=1
$(cmake-utils_use_enable static-libs STATIC_LIBS)
-DWITH_SSL=$(usex ssl system bundled)
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
)
if in_iuse bindist ; then
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 39eed57..8b4eb5a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -8,6 +8,7 @@
# - MySQL Team <[email protected]>
# - Robin H. Johnson <[email protected]>
# - Jorge Manuel B. S. Vicetto <[email protected]>
+# - Brian Evans <[email protected]>
# @BLURB: This eclass provides most of the functions for mysql ebuilds
# @DESCRIPTION:
# The mysql-multilib.eclass is the base eclass to build the mysql and
@@ -445,6 +446,8 @@ multilib_src_configure() {
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_SSL=$(usex ssl system bundled)
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
)
if in_iuse bindist ; then
