1 |
grknight 15/07/30 04:22:47 |
2 |
|
3 |
Modified: ChangeLog mysql-multilib.eclass |
4 |
Log: |
5 |
Add blocker below virtual/mysql-5.6-r4 for new split ebuilds |
6 |
|
7 |
Revision Changes Path |
8 |
1.1737 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1736&r2=1.1737 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1736 |
18 |
retrieving revision 1.1737 |
19 |
diff -u -r1.1736 -r1.1737 |
20 |
--- ChangeLog 29 Jul 2015 15:01:43 -0000 1.1736 |
21 |
+++ ChangeLog 30 Jul 2015 04:22:47 -0000 1.1737 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30 04:22:47 grknight Exp $ |
27 |
+ |
28 |
+ 30 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
29 |
+ Add blocker below virtual/mysql-5.6-r4 for new split ebuilds |
30 |
|
31 |
29 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
32 |
Fix pkg_config function error with non-existant USE flags |
33 |
|
34 |
|
35 |
|
36 |
1.25 eclass/mysql-multilib.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.24&r2=1.25 |
41 |
|
42 |
Index: mysql-multilib.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
45 |
retrieving revision 1.24 |
46 |
retrieving revision 1.25 |
47 |
diff -u -r1.24 -r1.25 |
48 |
--- mysql-multilib.eclass 29 Jul 2015 15:01:43 -0000 1.24 |
49 |
+++ mysql-multilib.eclass 30 Jul 2015 04:22:47 -0000 1.25 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25 2015/07/30 04:22:47 grknight Exp $ |
55 |
|
56 |
# @ECLASS: mysql-multilib.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -385,7 +385,8 @@ |
59 |
if [[ ${HAS_TOOLS_PATCH} ]] ; then |
60 |
RDEPEND="${RDEPEND} |
61 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
62 |
- !client-libs? ( virtual/libmysqlclient )" |
63 |
+ !client-libs? ( virtual/libmysqlclient ) |
64 |
+ !<virtual/mysql-5.6-r4" |
65 |
else |
66 |
RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )" |
67 |
fi |
68 |
@@ -588,7 +589,7 @@ |
69 |
fi |
70 |
|
71 |
# debug hack wrt #497532 |
72 |
- mycmakeargs=( |
73 |
+ mycmakeargs+=( |
74 |
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" |
75 |
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" |
76 |
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr |