| 1 |
ssuominen 11/09/27 19:39:02 |
| 2 |
|
| 3 |
Modified: libsndfile-1.0.25.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet and Pacho Ramos |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-libs/libsndfile/libsndfile-1.0.25.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: libsndfile-1.0.25.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- libsndfile-1.0.25.ebuild 12 Sep 2011 14:43:23 -0000 1.6 |
| 23 |
+++ libsndfile-1.0.25.ebuild 27 Sep 2011 19:39:02 -0000 1.7 |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.6 2011/09/12 14:43:23 xarthisius Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.7 2011/09/27 19:39:02 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
-inherit eutils autotools |
| 32 |
+inherit autotools eutils flag-o-matic multilib |
| 33 |
|
| 34 |
MY_P=${P/_pre/pre} |
| 35 |
|
| 36 |
@@ -30,9 +30,13 @@ |
| 37 |
|
| 38 |
S=${WORKDIR}/${MY_P} |
| 39 |
|
| 40 |
+# Keep this function synced with x11-libs/pango ebuild! |
| 41 |
+function multilib_enabled() { |
| 42 |
+ has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) |
| 43 |
+} |
| 44 |
+ |
| 45 |
src_prepare() { |
| 46 |
- sed -i -e "s/noinst_PROGRAMS/check_PROGRAMS/" "${S}/tests/Makefile.am" \ |
| 47 |
- "${S}/examples/Makefile.am" || die "sed failed" |
| 48 |
+ sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' {examples,tests}/Makefile.am || die |
| 49 |
|
| 50 |
epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch |
| 51 |
|
| 52 |
@@ -41,7 +45,10 @@ |
| 53 |
} |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
- econf $(use_enable sqlite) \ |
| 57 |
+ multilib_enabled && append-lfs-flags #313259 |
| 58 |
+ |
| 59 |
+ econf \ |
| 60 |
+ $(use_enable sqlite) \ |
| 61 |
$(use_enable static-libs static) \ |
| 62 |
$(use_enable alsa) \ |
| 63 |
$(use_enable !minimal external-libs) \ |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.130 media-libs/libsndfile/ChangeLog |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?rev=1.130&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?rev=1.130&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?r1=1.129&r2=1.130 |
| 72 |
|
| 73 |
Index: ChangeLog |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v |
| 76 |
retrieving revision 1.129 |
| 77 |
retrieving revision 1.130 |
| 78 |
diff -u -r1.129 -r1.130 |
| 79 |
--- ChangeLog 12 Sep 2011 15:22:25 -0000 1.129 |
| 80 |
+++ ChangeLog 27 Sep 2011 19:39:02 -0000 1.130 |
| 81 |
@@ -1,6 +1,10 @@ |
| 82 |
# ChangeLog for media-libs/libsndfile |
| 83 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 84 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.129 2011/09/12 15:22:25 aballier Exp $ |
| 85 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.130 2011/09/27 19:39:02 ssuominen Exp $ |
| 86 |
+ |
| 87 |
+ 27 Sep 2011; Samuli Suominen <ssuominen@g.o> libsndfile-1.0.25.ebuild: |
| 88 |
+ Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet |
| 89 |
+ and Pacho Ramos |
| 90 |
|
| 91 |
12 Sep 2011; Alexis Ballier <aballier@g.o> -libsndfile-1.0.23.ebuild, |
| 92 |
-libsndfile-1.0.24.ebuild: |
Archives