summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-08 04:23:11 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-08 04:23:11 +0000
commit42d5ae6128a3445e4b69e35b2f2707bdbe52e6d4 (patch)
tree15e265196e0b35c204f365b44e6d1e7b798fa4c4 /media-video/ffmpeg
parentRemoved COPYING from dodoc. (diff)
downloadgentoo-2-42d5ae6128a3445e4b69e35b2f2707bdbe52e6d4.tar.gz
gentoo-2-42d5ae6128a3445e4b69e35b2f2707bdbe52e6d4.tar.bz2
gentoo-2-42d5ae6128a3445e4b69e35b2f2707bdbe52e6d4.zip
Use -rpath-link to make sure that the libraries are linked correctly, should fixes bug #132171.
(Portage version: 2.1_pre10-r3)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog7
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild7
2 files changed, 12 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c1dd5054f9c7..6ab0a3d7f245 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.136 2006/05/03 20:51:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.137 2006/05/08 04:23:11 flameeyes Exp $
+
+ 08 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+ ffmpeg-0.4.9_p20060302.ebuild:
+ Use -rpath-link to make sure that the libraries are linked correctly, should
+ fixes bug #132171.
03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
Update metadata to list media-video@gentoo.org as maintainer.
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index 0856560e0f62..bf5f9b58d97b 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.13 2006/04/20 21:57:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.14 2006/05/08 04:23:11 flameeyes Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -178,6 +178,11 @@ src_compile() {
fi
fi
+ # This is needed to make sure that when linking with --as-needed all the
+ # libraries are found in the right places, not suitable for upstream yet as
+ # it's GNU-ld only (most likely).
+ append-ldflags "-Wl,-rpath-link,${S_SHARED}/libav"{codec,format,util}
+
cd ${S_SHARED}
#econf generates configure options unknown to ffmpeg's configure, so configure manually
./configure \