From 641df27cc9d0be5d028f97f95b9f365b497a9b4b Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Thu, 31 Jul 2014 22:26:07 +0000 Subject: Update mysql cmake eclasses to prevent upstream from setting default features and CFLAGS --- eclass/ChangeLog | 7 ++++++- eclass/mysql-cmake.eclass | 4 +++- eclass/mysql-multilib.eclass | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'eclass') 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 mysql-cmake.eclass, + mysql-multilib.eclass: + Update CMake variables to prevent MySQL from setting default CFLAGS + and features 31 Jul 2014; Brian Evans 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 # - Robin H. Johnson # - Jorge Manuel B. S. Vicetto +# - Brian Evans # @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 -- cgit v1.2.3-65-gdbad