diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-07-31 22:26:07 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-07-31 22:26:07 +0000 |
| commit | d343b45eb4e0dd082080895d3a34fea94d93fc07 (patch) | |
| tree | 8ff445e274db40abd59b36036fb46ae49be3b523 /eclass | |
| parent | version bump, also drop old (diff) | |
| download | gentoo-2-d343b45eb4e0dd082080895d3a34fea94d93fc07.tar.gz gentoo-2-d343b45eb4e0dd082080895d3a34fea94d93fc07.tar.bz2 gentoo-2-d343b45eb4e0dd082080895d3a34fea94d93fc07.zip | |
Update mysql cmake eclasses to prevent upstream from setting default features and CFLAGS
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/mysql-cmake.eclass | 4 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3012787440ba..c006b0eb019f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1334 2014/07/31 02:31:09 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1335 2014/07/31 22:26:07 grknight Exp $ + + 31 Jul 2014; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass, + mysql-multilib.eclass: + Update CMake variables to prevent MySQL from setting default CFLAGS + and features 31 Jul 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: Update the multilib eclass to match the work done by grobian for mysql-v2 diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 8360ded4a422..979077db7120 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.23 2014/07/29 17:59:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.24 2014/07/31 22:26:07 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -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 39eed577ad9a..58aba05ffc18 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.3 2014/07/31 02:31:09 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.4 2014/07/31 22:26:07 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -8,6 +8,7 @@ # - MySQL Team <mysql-bugs@gentoo.org> # - Robin H. Johnson <robbat2@gentoo.org> # - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +# - Brian Evans <grknight@gentoo.org> # @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 |