summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-11 00:14:09 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-11 00:14:09 +0000
commitfa89715f70c1eef1612bbf3d43d51b7ac4797216 (patch)
treeff8ed6b81807af52e49a572c325b11a46d84ea42 /media-libs
parentRemove IDEA algos from USE=bindist #398439 by Ulrich Müller. Update EAPI an... (diff)
downloadgentoo-2-fa89715f70c1eef1612bbf3d43d51b7ac4797216.tar.gz
gentoo-2-fa89715f70c1eef1612bbf3d43d51b7ac4797216.tar.bz2
gentoo-2-fa89715f70c1eef1612bbf3d43d51b7ac4797216.zip
Fix underlinking in tests (bug #398369, thanks to Michael (kensington) for the patch).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/audiofile/ChangeLog9
-rw-r--r--media-libs/audiofile/audiofile-0.3.2.ebuild7
-rw-r--r--media-libs/audiofile/files/audiofile-0.3.2-gold.patch27
3 files changed, 39 insertions, 4 deletions
diff --git a/media-libs/audiofile/ChangeLog b/media-libs/audiofile/ChangeLog
index d2f7e52d145f..bfdc99eae209 100644
--- a/media-libs/audiofile/ChangeLog
+++ b/media-libs/audiofile/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/audiofile
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.93 2011/12/29 17:53:24 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.94 2012/01/11 00:14:08 tetromino Exp $
+
+ 11 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ audiofile-0.3.2.ebuild, +files/audiofile-0.3.2-gold.patch:
+ Fix underlinking in tests (bug #398369, thanks to Michael (kensington) for
+ the patch).
29 Dec 2011; Pacho Ramos <pacho@gentoo.org> audiofile-0.3.2.ebuild:
amd64 stable, bug 393007
diff --git a/media-libs/audiofile/audiofile-0.3.2.ebuild b/media-libs/audiofile/audiofile-0.3.2.ebuild
index 072e1351c2aa..162990a719db 100644
--- a/media-libs/audiofile/audiofile-0.3.2.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.2.ebuild,v 1.3 2011/12/29 17:53:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.2.ebuild,v 1.4 2012/01/11 00:14:08 tetromino Exp $
EAPI="4"
@@ -17,6 +17,9 @@ IUSE="static-libs"
DOCS=( ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS NOTES README TODO )
src_prepare() {
+ # Fix underlinking in tests, bug #398369; requires eautoreconf
+ epatch "${FILESDIR}/${PN}-0.3.2-gold.patch"
+
# Don't build examples
sed -i -e "/^SRC_SUBDIRS/s: examples::" Makefile.am || die
diff --git a/media-libs/audiofile/files/audiofile-0.3.2-gold.patch b/media-libs/audiofile/files/audiofile-0.3.2-gold.patch
new file mode 100644
index 000000000000..e49f5b4a6b72
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.2-gold.patch
@@ -0,0 +1,27 @@
+From f9cd73065404f7abd8064fef42b91260ecce37f9 Mon Sep 17 00:00:00 2001
+From: Michael <kensington@astralcloak.net>
+Date: Tue, 10 Jan 2012 22:43:09 +1100
+Subject: [PATCH] Fix underlinking in test/printmarkers so that it will build
+ with gold.
+
+---
+ test/Makefile.am | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 187fe1a..cfa9d71 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -58,6 +58,9 @@ DEPENDENCIES = $(LIBAUDIOFILE)
+
+ LIBGTEST = gtest/libgtest.la
+
++printmarkers_SOURCES = printmarkers.c
++printmarkers_LDADD = $(LIBAUDIOFILE) -lm
++
+ sign_SOURCES = sign.cpp
+ sign_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+
+--
+1.7.8.3
+