diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-01-04 23:11:21 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-01-04 23:11:21 +0000 |
| commit | 2aa8feafcaa3a69ad87a907a5b96102307343329 (patch) | |
| tree | ed5b3e43a41b8300494085d1852222bbef725459 /media-libs | |
| parent | version bump (diff) | |
| download | gentoo-2-2aa8feafcaa3a69ad87a907a5b96102307343329.tar.gz gentoo-2-2aa8feafcaa3a69ad87a907a5b96102307343329.tar.bz2 gentoo-2-2aa8feafcaa3a69ad87a907a5b96102307343329.zip | |
Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries eclass function.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-9-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-9.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog index 4602749c94fc..65d9f04ec2b0 100644 --- a/media-libs/jpeg/ChangeLog +++ b/media-libs/jpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/jpeg -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.144 2013/08/06 13:48:59 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.145 2014/01/04 23:11:21 mgorny Exp $ + + 04 Jan 2014; Michał Górny <mgorny@gentoo.org> jpeg-9-r1.ebuild, jpeg-9.ebuild: + Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries + eclass function. *jpeg-9-r1 (06 Aug 2013) diff --git a/media-libs/jpeg/jpeg-9-r1.ebuild b/media-libs/jpeg/jpeg-9-r1.ebuild index 1ce4ab8e18f0..097a8f77f6d7 100644 --- a/media-libs/jpeg/jpeg-9-r1.ebuild +++ b/media-libs/jpeg/jpeg-9-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9-r1.ebuild,v 1.1 2013/08/06 13:48:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9-r1.ebuild,v 1.2 2014/01/04 23:11:21 mgorny Exp $ EAPI=5 inherit eutils libtool toolchain-funcs multilib-minimal @@ -43,7 +43,7 @@ multilib_src_configure() { multilib_src_compile() { emake - if [[ ${ABI} == ${DEFAULT_ABI} ]]; then + if multilib_build_binaries; then # Build exifautotran and jpegexiforient cd ../debian/extra emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" diff --git a/media-libs/jpeg/jpeg-9.ebuild b/media-libs/jpeg/jpeg-9.ebuild index e1c1bd9b06d7..ce6d0aaaa484 100644 --- a/media-libs/jpeg/jpeg-9.ebuild +++ b/media-libs/jpeg/jpeg-9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.3 2013/08/01 20:24:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.4 2014/01/04 23:11:21 mgorny Exp $ EAPI=5 inherit eutils libtool toolchain-funcs multilib-minimal @@ -41,7 +41,7 @@ multilib_src_configure() { multilib_src_compile() { emake - if [[ ${ABI} == ${DEFAULT_ABI} ]]; then + if multilib_build_binaries; then # Build exifautotran and jpegexiforient cd ../debian/extra emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" |