| 1 |
grknight 15/07/29 15:01:43 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-multilib.eclass |
| 4 |
Log: |
| 5 |
Fix pkg_config function error with non-existant USE flags |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1736 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1735&r2=1.1736 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1735 |
| 18 |
retrieving revision 1.1736 |
| 19 |
diff -u -r1.1735 -r1.1736 |
| 20 |
--- ChangeLog 28 Jul 2015 20:51:40 -0000 1.1735 |
| 21 |
+++ ChangeLog 29 Jul 2015 15:01:43 -0000 1.1736 |
| 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.1735 2015/07/28 20:51:40 grknight Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 29 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 29 |
+ Fix pkg_config function error with non-existant USE flags |
| 30 |
|
| 31 |
28 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 32 |
Fix configuring non-native abi which leads to build failure wrt bug 556162 |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.24 eclass/mysql-multilib.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.23&r2=1.24 |
| 41 |
|
| 42 |
Index: mysql-multilib.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
| 45 |
retrieving revision 1.23 |
| 46 |
retrieving revision 1.24 |
| 47 |
diff -u -r1.23 -r1.24 |
| 48 |
--- mysql-multilib.eclass 28 Jul 2015 20:51:40 -0000 1.23 |
| 49 |
+++ mysql-multilib.eclass 29 Jul 2015 15:01:43 -0000 1.24 |
| 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.23 2015/07/28 20:51:40 grknight Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $ |
| 55 |
|
| 56 |
# @ECLASS: mysql-multilib.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -876,9 +876,14 @@ |
| 59 |
mysql_init_vars |
| 60 |
|
| 61 |
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" |
| 62 |
- |
| 63 |
- if built_with_use ${CATEGORY}/${PN} minimal && ! built_with_use ${CATEGORY}/${PN} server ; then |
| 64 |
- die "Minimal builds do NOT include the MySQL server" |
| 65 |
+ if [[ ${HAS_TOOLS_PATCH} ]] ; then |
| 66 |
+ if ! built_with_use ${CATEGORY}/${PN} server ; then |
| 67 |
+ die "Minimal builds do NOT include the MySQL server" |
| 68 |
+ fi |
| 69 |
+ else |
| 70 |
+ if built_with_use ${CATEGORY}/${PN} minimal ; then |
| 71 |
+ die "Minimal builds do NOT include the MySQL server" |
| 72 |
+ fi |
| 73 |
fi |
| 74 |
|
| 75 |
if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then |
Archives