diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-12-04 22:53:47 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-12-04 22:53:47 +0000 |
| commit | ad49e32f8056ef7513df6e123677fc1acf967d6d (patch) | |
| tree | 87774e227e4784ed15aa461490de29cf16f8a8bc | |
| parent | Enable --enable-early-chroot so config files can be per-chroot #388395 by Tou... (diff) | |
| download | gentoo-2-ad49e32f8056ef7513df6e123677fc1acf967d6d.tar.gz gentoo-2-ad49e32f8056ef7513df6e123677fc1acf967d6d.tar.bz2 gentoo-2-ad49e32f8056ef7513df6e123677fc1acf967d6d.zip | |
Fix linking order (bug #393137).
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
| -rw-r--r-- | media-sound/aacplusenc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/aacplusenc/aacplusenc-0.17.5.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch | 13 |
3 files changed, 23 insertions, 2 deletions
diff --git a/media-sound/aacplusenc/ChangeLog b/media-sound/aacplusenc/ChangeLog index 0c7908691d3f..10895e20b8d4 100644 --- a/media-sound/aacplusenc/ChangeLog +++ b/media-sound/aacplusenc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/aacplusenc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.3 2011/06/27 06:50:29 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.4 2011/12/04 22:53:46 radhermit Exp $ + + 04 Dec 2011; Tim Harder <radhermit@gentoo.org> aacplusenc-0.17.5.ebuild, + +files/aacplusenc-0.17.5-libm.patch: + Fix linking order (bug #393137). *aacplusenc-0.17.5 (27 Jun 2011) diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild index 76bbe2e8adac..ff4eb7b9f590 100644 --- a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild +++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.1 2011/06/27 06:50:29 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.2 2011/12/04 22:53:46 radhermit Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -25,6 +25,10 @@ S=${WORKDIR}/${PN} src_prepare() { epatch "${FILESDIR}"/${P}-asneeded.patch + + # Fix linking order (bug #393137) + epatch "${FILESDIR}"/${P}-libm.patch + sed \ -e 's:LDFLAGS:LIBRARIES:g' \ -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch new file mode 100644 index 000000000000..37a3f904fea3 --- /dev/null +++ b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch @@ -0,0 +1,13 @@ +--- aacplusenc/Makefile.orig ++++ aacplusenc/Makefile +@@ -5,9 +5,8 @@ + LIBS=libaacenc/libaacenc.a libbitbuf/libbitbuf.a libfr/libfr.a libsbrenc/libsbrenc.a libresamp/libresamp.a + TARGET=aacplusenc + +-LDFLAGS=-lm + LDFLAGS+=-L$(TOPDIR)/libaacenc -L$(TOPDIR)/libbitbuf -L$(TOPDIR)/libfr -L$(TOPDIR)/libsbrenc -L$(TOPDIR)/libresamp +-LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp ++LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp -lm + + ifdef FFTW3 + LDFLAGS+=-lfftw3f |