diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-07 14:31:18 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-07 14:31:18 +0000 |
| commit | 9a4e1601169f700c81b8a5258d6e0f5bcbf8adc7 (patch) | |
| tree | de3f3c084ae11c21fdac3bcd73484d65994b4be5 /dev-libs/cyrus-sasl | |
| parent | version bump (diff) | |
| download | gentoo-2-9a4e1601169f700c81b8a5258d6e0f5bcbf8adc7.tar.gz gentoo-2-9a4e1601169f700c81b8a5258d6e0f5bcbf8adc7.tar.bz2 gentoo-2-9a4e1601169f700c81b8a5258d6e0f5bcbf8adc7.zip | |
Pass --enable-sql for non-native build only when SQLite is enabled (since MySQL and PgSQL are not multilib ATM), bug #516514.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-libs/cyrus-sasl')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 93ec7866507a..b74c873e010b 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.301 2014/06/19 07:20:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.302 2014/07/07 14:31:18 mgorny Exp $ + + 07 Jul 2014; Michał Górny <mgorny@gentoo.org> cyrus-sasl-2.1.26-r7.ebuild: + Pass --enable-sql for non-native build only when SQLite is enabled (since + MySQL and PgSQL are not multilib ATM), bug #516514. 19 Jun 2014; Michał Górny <mgorny@gentoo.org> cyrus-sasl-2.1.26-r7.ebuild: Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild index 2235cd2e36c6..1ae9e4b13a75 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild @@ -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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.2 2014/06/19 07:20:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.3 2014/07/07 14:31:18 mgorny Exp $ EAPI=5 @@ -99,7 +99,7 @@ multilib_src_configure() { myconf+=( --without-des ) fi - if use mysql || use postgres || use sqlite ; then + if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then myconf+=( --enable-sql ) else myconf+=( --disable-sql ) |