grknight 14/07/31 22:26:07 Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass Log: Update mysql cmake eclasses to prevent upstream from setting default features and CFLAGS
Revision Changes Path 1.1335 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1335&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1335&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1334&r2=1.1335 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1334 retrieving revision 1.1335 diff -u -r1.1334 -r1.1335 --- ChangeLog 31 Jul 2014 02:31:09 -0000 1.1334 +++ ChangeLog 31 Jul 2014 22:26:07 -0000 1.1335 @@ -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 <[email protected]> mysql-cmake.eclass, + mysql-multilib.eclass: + Update CMake variables to prevent MySQL from setting default CFLAGS + and features 31 Jul 2014; Brian Evans <[email protected]> mysql-multilib.eclass: Update the multilib eclass to match the work done by grobian for mysql-v2 1.24 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.23&r2=1.24 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mysql-cmake.eclass 29 Jul 2014 17:59:21 -0000 1.23 +++ mysql-cmake.eclass 31 Jul 2014 22:26:07 -0000 1.24 @@ -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 @@ -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 1.4 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.3&r2=1.4 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysql-multilib.eclass 31 Jul 2014 02:31:09 -0000 1.3 +++ mysql-multilib.eclass 31 Jul 2014 22:26:07 -0000 1.4 @@ -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 <[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 @@ -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
