| 1 |
grknight 14/07/31 22:26:07 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass |
| 4 |
Log: |
| 5 |
Update mysql cmake eclasses to prevent upstream from setting default features and CFLAGS |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1335 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1335&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1335&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1334&r2=1.1335 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1334 |
| 18 |
retrieving revision 1.1335 |
| 19 |
diff -u -r1.1334 -r1.1335 |
| 20 |
--- ChangeLog 31 Jul 2014 02:31:09 -0000 1.1334 |
| 21 |
+++ ChangeLog 31 Jul 2014 22:26:07 -0000 1.1335 |
| 22 |
@@ -1,6 +1,11 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1334 2014/07/31 02:31:09 grknight Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1335 2014/07/31 22:26:07 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 31 Jul 2014; Brian Evans <grknight@g.o> mysql-cmake.eclass, |
| 29 |
+ mysql-multilib.eclass: |
| 30 |
+ Update CMake variables to prevent MySQL from setting default CFLAGS |
| 31 |
+ and features |
| 32 |
|
| 33 |
31 Jul 2014; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 34 |
Update the multilib eclass to match the work done by grobian for mysql-v2 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.24 eclass/mysql-cmake.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.24&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.24&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.23&r2=1.24 |
| 43 |
|
| 44 |
Index: mysql-cmake.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v |
| 47 |
retrieving revision 1.23 |
| 48 |
retrieving revision 1.24 |
| 49 |
diff -u -r1.23 -r1.24 |
| 50 |
--- mysql-cmake.eclass 29 Jul 2014 17:59:21 -0000 1.23 |
| 51 |
+++ mysql-cmake.eclass 31 Jul 2014 22:26:07 -0000 1.24 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.23 2014/07/29 17:59:21 robbat2 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.24 2014/07/31 22:26:07 grknight Exp $ |
| 57 |
|
| 58 |
# @ECLASS: mysql-cmake.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -317,6 +317,8 @@ |
| 61 |
-DENABLED_LOCAL_INFILE=1 |
| 62 |
$(cmake-utils_use_enable static-libs STATIC_LIBS) |
| 63 |
-DWITH_SSL=$(usex ssl system bundled) |
| 64 |
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0 |
| 65 |
+ -DWITH_DEFAULT_FEATURE_SET=0 |
| 66 |
) |
| 67 |
|
| 68 |
if in_iuse bindist ; then |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.4 eclass/mysql-multilib.eclass |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.4&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.4&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.3&r2=1.4 |
| 77 |
|
| 78 |
Index: mysql-multilib.eclass |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
| 81 |
retrieving revision 1.3 |
| 82 |
retrieving revision 1.4 |
| 83 |
diff -u -r1.3 -r1.4 |
| 84 |
--- mysql-multilib.eclass 31 Jul 2014 02:31:09 -0000 1.3 |
| 85 |
+++ mysql-multilib.eclass 31 Jul 2014 22:26:07 -0000 1.4 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
# Copyright 1999-2014 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.3 2014/07/31 02:31:09 grknight Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.4 2014/07/31 22:26:07 grknight Exp $ |
| 91 |
|
| 92 |
# @ECLASS: mysql-multilib.eclass |
| 93 |
# @MAINTAINER: |
| 94 |
@@ -8,6 +8,7 @@ |
| 95 |
# - MySQL Team <mysql-bugs@g.o> |
| 96 |
# - Robin H. Johnson <robbat2@g.o> |
| 97 |
# - Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 98 |
+# - Brian Evans <grknight@g.o> |
| 99 |
# @BLURB: This eclass provides most of the functions for mysql ebuilds |
| 100 |
# @DESCRIPTION: |
| 101 |
# The mysql-multilib.eclass is the base eclass to build the mysql and |
| 102 |
@@ -445,6 +446,8 @@ |
| 103 |
-DENABLED_LOCAL_INFILE=1 |
| 104 |
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock |
| 105 |
-DWITH_SSL=$(usex ssl system bundled) |
| 106 |
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0 |
| 107 |
+ -DWITH_DEFAULT_FEATURE_SET=0 |
| 108 |
) |
| 109 |
|
| 110 |
if in_iuse bindist ; then |
Archives