diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-10-03 15:58:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-10-03 15:58:18 +0000 |
| commit | 7d0046d0578cc887e0b47703c72169f22d10e101 (patch) | |
| tree | ee4fa6441e5b4c072c199f1c2b86a8fb5a32c8ea /media-libs/libwebp/libwebp-0.3.1.ebuild | |
| parent | Version bump (diff) | |
| download | gentoo-2-7d0046d0578cc887e0b47703c72169f22d10e101.tar.gz gentoo-2-7d0046d0578cc887e0b47703c72169f22d10e101.tar.bz2 gentoo-2-7d0046d0578cc887e0b47703c72169f22d10e101.zip | |
Stop building gif2webp binary for non-native ABI to avoid build failure (and to avoid converting giflib to multilib needlessly) wrt #486646 by Ian Abbott
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs/libwebp/libwebp-0.3.1.ebuild')
| -rw-r--r-- | media-libs/libwebp/libwebp-0.3.1.ebuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media-libs/libwebp/libwebp-0.3.1.ebuild b/media-libs/libwebp/libwebp-0.3.1.ebuild index 55033cc51038..893462524b5d 100644 --- a/media-libs/libwebp/libwebp-0.3.1.ebuild +++ b/media-libs/libwebp/libwebp-0.3.1.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/libwebp/libwebp-0.3.1.ebuild,v 1.12 2013/09/26 17:31:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/libwebp-0.3.1.ebuild,v 1.13 2013/10/03 15:58:18 ssuominen Exp $ EAPI=5 inherit eutils multilib-minimal @@ -34,7 +34,11 @@ src_prepare() { } multilib_src_configure() { - ac_cv_header_gif_lib_h=$(usex gif) \ + # Only used for gif2webp binary wrt #486646 + local build_gif2webp=$(usex gif) + multilib_build_binaries || build_gif2webp=no + + ac_cv_header_gif_lib_h=${build_gif2webp} \ ac_cv_header_jpeglib_h=$(usex jpeg) \ ac_cv_header_png_h=$(usex png) \ ac_cv_header_GL_glut_h=$(usex opengl) \ |