diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-29 20:13:47 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-29 20:13:47 +0000 |
| commit | bd03036fa5be3322449601f1d73a2857faa3cb79 (patch) | |
| tree | 055db34416e79e538e7f35a936e25416e570ef07 /media-libs/speex | |
| parent | die hard on gnu gold linker wrt #475210 (diff) | |
| download | gentoo-2-bd03036fa5be3322449601f1d73a2857faa3cb79.tar.gz gentoo-2-bd03036fa5be3322449601f1d73a2857faa3cb79.tar.bz2 gentoo-2-bd03036fa5be3322449601f1d73a2857faa3cb79.zip | |
Do not build speexenc/speexdec for non native ABIs and drop now useless MULTILIB_USEDEP on libogg
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/speex')
| -rw-r--r-- | media-libs/speex/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/speex/speex-1.2_rc1-r2.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog index 8edd8646f51f..db7cd9f7b39e 100644 --- a/media-libs/speex/ChangeLog +++ b/media-libs/speex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/speex # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.104 2013/07/28 22:29:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.105 2013/07/29 20:13:47 aballier Exp $ + + 29 Jul 2013; Alexis Ballier <aballier@gentoo.org> speex-1.2_rc1-r2.ebuild: + Do not build speexenc/speexdec for non native ABIs and drop now useless + MULTILIB_USEDEP on libogg *speex-1.2_rc1-r2 (28 Jul 2013) diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild index c7a83caf3ce7..c9faf633d666 100644 --- a/media-libs/speex/speex-1.2_rc1-r2.ebuild +++ b/media-libs/speex/speex-1.2_rc1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r2.ebuild,v 1.1 2013/07/28 22:29:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r2.ebuild,v 1.2 2013/07/29 20:13:47 aballier Exp $ EAPI=5 inherit autotools eutils flag-o-matic multilib-minimal @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="ogg sse static-libs" -RDEPEND="ogg? ( media-libs/libogg:=[${MULTILIB_USEDEP}] ) +RDEPEND="ogg? ( media-libs/libogg:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} @@ -44,7 +44,8 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable static-libs static) \ $(use_enable sse) \ - $(use_enable ogg) + $( [ "${ABI}" = "${DEFAULT_ABI}" ] && echo $(use_enable ogg)) + # ogg is only for speexdec/speexenc binaries, useless for non native ABIs } multilib_src_install() { |