summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-27 19:39:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-27 19:39:02 +0000
commitb4810de6a9bc004a8faceb741c289ce2d2ba2426 (patch)
treee17d5f629aebe3da9529d141da3e3f6cad1e781e /media-libs/libsndfile
parentAdd missing boost dependency, bug 384519 (diff)
downloadgentoo-2-b4810de6a9bc004a8faceb741c289ce2d2ba2426.tar.gz
gentoo-2-b4810de6a9bc004a8faceb741c289ce2d2ba2426.tar.bz2
gentoo-2-b4810de6a9bc004a8faceb741c289ce2d2ba2426.zip
Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet and Pacho Ramos
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libsndfile')
-rw-r--r--media-libs/libsndfile/ChangeLog6
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.25.ebuild17
2 files changed, 17 insertions, 6 deletions
diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index c6b548381c19..606d04a0bcf7 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libsndfile
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.129 2011/09/12 15:22:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.130 2011/09/27 19:39:02 ssuominen Exp $
+
+ 27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libsndfile-1.0.25.ebuild:
+ Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet
+ and Pacho Ramos
12 Sep 2011; Alexis Ballier <aballier@gentoo.org> -libsndfile-1.0.23.ebuild,
-libsndfile-1.0.24.ebuild:
diff --git a/media-libs/libsndfile/libsndfile-1.0.25.ebuild b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
index 7e899373e6fa..88428ad1ded9 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.6 2011/09/12 14:43:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.7 2011/09/27 19:39:02 ssuominen Exp $
EAPI=4
-inherit eutils autotools
+inherit autotools eutils flag-o-matic multilib
MY_P=${P/_pre/pre}
@@ -30,9 +30,13 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+# Keep this function synced with x11-libs/pango ebuild!
+function multilib_enabled() {
+ has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
+}
+
src_prepare() {
- sed -i -e "s/noinst_PROGRAMS/check_PROGRAMS/" "${S}/tests/Makefile.am" \
- "${S}/examples/Makefile.am" || die "sed failed"
+ sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' {examples,tests}/Makefile.am || die
epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch
@@ -41,7 +45,10 @@ src_prepare() {
}
src_configure() {
- econf $(use_enable sqlite) \
+ multilib_enabled && append-lfs-flags #313259
+
+ econf \
+ $(use_enable sqlite) \
$(use_enable static-libs static) \
$(use_enable alsa) \
$(use_enable !minimal external-libs) \