diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2009-01-19 14:29:19 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2009-01-19 14:29:19 +0000 |
| commit | 1f0d65e6d2294a383dce99da015dab26d7d08306 (patch) | |
| tree | e55682bc53d12ce0c8ec4995b9e037168fc0ab0b /app-misc/rio500 | |
| parent | Changed SRC_URI. (diff) | |
| download | gentoo-2-1f0d65e6d2294a383dce99da015dab26d7d08306.tar.gz gentoo-2-1f0d65e6d2294a383dce99da015dab26d7d08306.tar.bz2 gentoo-2-1f0d65e6d2294a383dce99da015dab26d7d08306.zip | |
QA: Fix compilation with --as-needed (bug 246905)
(Portage version: 2.2_rc22/cvs/Linux 2.6.29-rc2-00013-gf3b8436 x86_64)
Diffstat (limited to 'app-misc/rio500')
| -rw-r--r-- | app-misc/rio500/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/rio500/files/rio500-0.7-asneeded.patch | 11 | ||||
| -rw-r--r-- | app-misc/rio500/rio500-0.7-r2.ebuild | 18 |
3 files changed, 27 insertions, 10 deletions
diff --git a/app-misc/rio500/ChangeLog b/app-misc/rio500/ChangeLog index 9ac31c3819fe..2c4ca38b7481 100644 --- a/app-misc/rio500/ChangeLog +++ b/app-misc/rio500/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/rio500 -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/ChangeLog,v 1.13 2007/01/06 00:31:33 kugelfang Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/ChangeLog,v 1.14 2009/01/19 14:29:18 angelos Exp $ + + 19 Jan 2009; Christoph Mende <angelos@gentoo.org> + +files/rio500-0.7-asneeded.patch, rio500-0.7-r2.ebuild: + QA: Fix compilation with --as-needed (bug 246905) 06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -rio500-0.7-r1.ebuild: QA: Removed unused versions. diff --git a/app-misc/rio500/files/rio500-0.7-asneeded.patch b/app-misc/rio500/files/rio500-0.7-asneeded.patch new file mode 100644 index 000000000000..00f4c3031c44 --- /dev/null +++ b/app-misc/rio500/files/rio500-0.7-asneeded.patch @@ -0,0 +1,11 @@ +--- rio500-0.7/src/Makefile.am.orig 2009-01-19 15:23:50.001056143 +0100 ++++ rio500-0.7/src/Makefile.am 2009-01-19 15:24:02.394059698 +0100 +@@ -15,7 +15,7 @@ + + CFLAGS = $(FLAGS1) $(FLAGS2) $(FLAGS3) + +-LDADD = -L../lib @GLIB_LIBS@ -lrio500 $(EFENCE_LIB) ++LDADD = -L../lib -lrio500 @GLIB_LIBS@ $(EFENCE_LIB) + + GETOPT_SOURCES = getopt.c getopt1.c + diff --git a/app-misc/rio500/rio500-0.7-r2.ebuild b/app-misc/rio500/rio500-0.7-r2.ebuild index 362319b0102b..e5ddbb975b01 100644 --- a/app-misc/rio500/rio500-0.7-r2.ebuild +++ b/app-misc/rio500/rio500-0.7-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r2.ebuild,v 1.9 2006/10/31 12:43:34 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r2.ebuild,v 1.10 2009/01/19 14:29:18 angelos Exp $ -inherit eutils +inherit autotools eutils DESCRIPTION="Command line tools for transfering mp3s to and from a Rio500" HOMEPAGE="http://rio500.sourceforge.net/" @@ -17,8 +17,10 @@ DEPEND="=dev-libs/glib-1.2*" src_unpack() { unpack ${A} - cd "${S}"/src/ - epatch "${FILESDIR}"/${P}_gcc34.patch + cd "${S}" + epatch "${FILESDIR}"/${P}_gcc34.patch \ + "${FILESDIR}"/${P}-asneeded.patch + eautoreconf } src_compile() { @@ -26,16 +28,16 @@ src_compile() { --with-fontpath=/usr/share/rio500/ \ --with-id3support || die # --with-usbdevfs - make || die + emake || die } src_install() { einstall \ - datadir=${D}/usr/share/rio500 || die + datadir="${D}"/usr/share/rio500 || die #delete /usr/include/getopt.h as it is part of glibc, and shouldn't be #installed with rio500 - rm ${D}/usr/include/getopt.h 2>/dev/null + rm "${D}"/usr/include/getopt.h 2>/dev/null dodoc AUTHORS ChangeLog NEWS README TODO dodoc fonts/Readme.txt |