diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-12-06 16:50:21 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-12-06 16:50:21 +0000 |
| commit | d56df2139f761444145cd0c104cfffb50c044a2d (patch) | |
| tree | 04c55e23505c712253151e964c6c232ea5900012 /media-libs/sdl-flic | |
| parent | Hopefully really fix bug #249964. (diff) | |
| download | gentoo-2-d56df2139f761444145cd0c104cfffb50c044a2d.tar.gz gentoo-2-d56df2139f761444145cd0c104cfffb50c044a2d.tar.bz2 gentoo-2-d56df2139f761444145cd0c104cfffb50c044a2d.zip | |
Fix linking with --as-needed, bug #247775
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'media-libs/sdl-flic')
| -rw-r--r-- | media-libs/sdl-flic/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/sdl-flic/files/Makefile | 7 | ||||
| -rw-r--r-- | media-libs/sdl-flic/sdl-flic-1.2.ebuild | 11 |
3 files changed, 15 insertions, 11 deletions
diff --git a/media-libs/sdl-flic/ChangeLog b/media-libs/sdl-flic/ChangeLog index c9067f9c309e..97804456a182 100644 --- a/media-libs/sdl-flic/ChangeLog +++ b/media-libs/sdl-flic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/sdl-flic -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/ChangeLog,v 1.5 2007/02/09 03:43:09 flameeyes Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/ChangeLog,v 1.6 2008/12/06 16:50:21 nyhm Exp $ + + 06 Dec 2008; Tristan Heaven <nyhm@gentoo.org> files/Makefile, + sdl-flic-1.2.ebuild: + Fix linking with --as-needed, bug #247775 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Regenerate digest in Manifest2 format. diff --git a/media-libs/sdl-flic/files/Makefile b/media-libs/sdl-flic/files/Makefile index cfba1c19835a..b4f9110ffc2b 100644 --- a/media-libs/sdl-flic/files/Makefile +++ b/media-libs/sdl-flic/files/Makefile @@ -1,5 +1,6 @@ CFLAGS += $(shell sdl-config --cflags) -I. -DINLINE= -LDFLAGS += $(shell sdl-config --libs) -L. +LDFLAGS += -L. +LIBS += $(shell sdl-config --libs) LIB_NAME = libSDL_flic LIB_SHARED = $(LIB_NAME).so @@ -16,7 +17,7 @@ all: $(TARGETS) SDL_flic.lo: SDL_flic.c $(CC) $(CFLAGS) -fPIC -o $@ -c $< $(LIB_SHARED): SDL_flic.lo - $(CC) $(LDFLAGS) SDL_flic.lo -shared -Wl,-soname,$@ -o $@.1.0.0 + $(CC) $(CFLAGS) $(LDFLAGS) SDL_flic.lo -shared -Wl,-soname,$@ -o $@.1.0.0 $(LIBS) ln -s $@.1.0.0 $@.1 ln -s $@.1 $@ @@ -24,7 +25,7 @@ $(LIB_STATIC): SDL_flic.o $(AR) rcs $@ $< $(BIN): $(LIB_SHARED) playflic.o - $(CC) $(LDFLAGS) -lSDL_flic -o $@ playflic.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ playflic.o -lSDL_flic $(LIBS) install: $(TARGETS) install -d -m 755 $(DESTDIR)/$(LIBDIR) diff --git a/media-libs/sdl-flic/sdl-flic-1.2.ebuild b/media-libs/sdl-flic/sdl-flic-1.2.ebuild index b8c2e38b798c..8267aac14cec 100644 --- a/media-libs/sdl-flic/sdl-flic-1.2.ebuild +++ b/media-libs/sdl-flic/sdl-flic-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/sdl-flic-1.2.ebuild,v 1.4 2005/12/10 20:48:51 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/sdl-flic-1.2.ebuild,v 1.5 2008/12/06 16:50:21 nyhm Exp $ inherit eutils @@ -13,10 +13,9 @@ SLOT="0" KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86" IUSE="" -DEPEND="sys-libs/zlib - >=media-libs/libsdl-1.2.4" +DEPEND="media-libs/libsdl" -S="${WORKDIR}"/SDL_flic-${PV} +S=${WORKDIR}/SDL_flic-${PV} src_unpack() { unpack ${A} @@ -27,6 +26,6 @@ src_unpack() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc README.txt } |