| 1 |
commit: 8a8dbdfdaac4233506946089191c2954a3275384 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 31 20:24:25 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 5 |
CommitDate: Thu Jul 31 20:24:25 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8a8dbdfd |
| 7 |
|
| 8 |
Remove mysql injected features and C(XX)FLAGS |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-cmake.eclass | 2 ++ |
| 12 |
eclass/mysql-multilib.eclass | 3 +++ |
| 13 |
2 files changed, 5 insertions(+) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 16 |
index 8360ded..925cdc5 100644 |
| 17 |
--- a/eclass/mysql-cmake.eclass |
| 18 |
+++ b/eclass/mysql-cmake.eclass |
| 19 |
@@ -317,6 +317,8 @@ mysql-cmake_src_configure() { |
| 20 |
-DENABLED_LOCAL_INFILE=1 |
| 21 |
$(cmake-utils_use_enable static-libs STATIC_LIBS) |
| 22 |
-DWITH_SSL=$(usex ssl system bundled) |
| 23 |
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0 |
| 24 |
+ -DWITH_DEFAULT_FEATURE_SET=0 |
| 25 |
) |
| 26 |
|
| 27 |
if in_iuse bindist ; then |
| 28 |
|
| 29 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 30 |
index 39eed57..8b4eb5a 100644 |
| 31 |
--- a/eclass/mysql-multilib.eclass |
| 32 |
+++ b/eclass/mysql-multilib.eclass |
| 33 |
@@ -8,6 +8,7 @@ |
| 34 |
# - MySQL Team <mysql-bugs@g.o> |
| 35 |
# - Robin H. Johnson <robbat2@g.o> |
| 36 |
# - Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 37 |
+# - Brian Evans <grknight@g.o> |
| 38 |
# @BLURB: This eclass provides most of the functions for mysql ebuilds |
| 39 |
# @DESCRIPTION: |
| 40 |
# The mysql-multilib.eclass is the base eclass to build the mysql and |
| 41 |
@@ -445,6 +446,8 @@ multilib_src_configure() { |
| 42 |
-DENABLED_LOCAL_INFILE=1 |
| 43 |
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock |
| 44 |
-DWITH_SSL=$(usex ssl system bundled) |
| 45 |
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0 |
| 46 |
+ -DWITH_DEFAULT_FEATURE_SET=0 |
| 47 |
) |
| 48 |
|
| 49 |
if in_iuse bindist ; then |
Archives