summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-07-30 14:04:41 +0000
committerBrian Evans <grknight@gentoo.org>2015-07-30 14:04:41 +0000
commitc98c289016722f600a0927a053c19cbc0ab20de7 (patch)
tree5af31a57d7e9e5cbb7310a079b12ef769ebeb609 /eclass
parentStable on alpha, bug 556288 (diff)
downloadhistorical-c98c289016722f600a0927a053c19cbc0ab20de7.tar.gz
historical-c98c289016722f600a0927a053c19cbc0ab20de7.tar.bz2
historical-c98c289016722f600a0927a053c19cbc0ab20de7.zip
Reset mycmakeargs between ABIs
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/mysql-multilib.eclass4
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7ffa0114d1ef..ac9d6fe62941 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30 04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30 14:04:41 grknight Exp $
+
+ 30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+ Reset variables between ABIs
30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 31af0bef5965..707280e943b2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25 2015/07/30 04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.26 2015/07/30 14:04:41 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -693,6 +693,8 @@ multilib_src_configure() {
-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
cmake-utils_src_configure
+ # Reset for each ABI
+ mycmakeargs=( )
}
mysql-multilib_src_compile() {