diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-31 11:37:31 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-31 11:37:31 +0000 |
| commit | c713bf978a939e69b6a1911d2f3018fcffe2231c (patch) | |
| tree | 029fcfea24109882a2af29388988610eafcd4af2 /media-video/ffmpeg | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c713bf978a939e69b6a1911d2f3018fcffe2231c.tar.gz gentoo-2-c713bf978a939e69b6a1911d2f3018fcffe2231c.tar.bz2 gentoo-2-c713bf978a939e69b6a1911d2f3018fcffe2231c.zip | |
Remove old hack for $LDFLAGS passing (fixed upstream), remove the append-flags (fixed upstream).
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index eb328e3c49af..674550a4f543 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.142 2006/05/31 10:04:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.143 2006/05/31 11:37:31 flameeyes Exp $ + + 31 May 2006; Diego Pettenò <flameeyes@gentoo.org> + ffmpeg-0.4.9_p20060530.ebuild: + Remove old hack for $LDFLAGS passing (fixed upstream), remove the + append-flags (fixed upstream). 31 May 2006; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.4.9_p20060530.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild index 8fc008410304..6ff97241a4a9 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.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_p20060530.ebuild,v 1.2 2006/05/31 10:04:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.3 2006/05/31 11:37:31 flameeyes Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -155,7 +155,6 @@ src_compile() { --mandir=/usr/share/man \ --enable-static --disable-shared \ "--cc=$(tc-getCC)" \ - "--extra-ldflags=${LDFLAGS}" \ ${myconf} || die "static failed" @@ -176,11 +175,6 @@ 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 \ @@ -188,7 +182,6 @@ src_compile() { --mandir=/usr/share/man \ --disable-static --enable-shared \ "--cc=$(tc-getCC)" \ - "--extra-ldflags=${LDFLAGS}" \ ${myconf} || die "shared failed" emake || die "shared failed" |