diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2012-11-12 19:14:37 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2012-11-12 19:14:37 +0000 |
| commit | 1cf64bf376cce4cc107ea6ef68704d4da9102096 (patch) | |
| tree | d970edaa8bc4d971c35e717117e45415477ee0c3 /media-radio/ibp | |
| parent | dev-vcs/git-cola: Fix doc installation, #442892 (diff) | |
| download | gentoo-2-1cf64bf376cce4cc107ea6ef68704d4da9102096.tar.gz gentoo-2-1cf64bf376cce4cc107ea6ef68704d4da9102096.tar.bz2 gentoo-2-1cf64bf376cce4cc107ea6ef68704d4da9102096.zip | |
Respect CFLAGS, do not use cc (bug #440900). Thanks Diego
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'media-radio/ibp')
| -rw-r--r-- | media-radio/ibp/ChangeLog | 8 | ||||
| -rw-r--r-- | media-radio/ibp/files/ibp-0.21-ldflags.patch | 7 | ||||
| -rw-r--r-- | media-radio/ibp/ibp-0.21.ebuild | 31 |
3 files changed, 27 insertions, 19 deletions
diff --git a/media-radio/ibp/ChangeLog b/media-radio/ibp/ChangeLog index 45016ea9faea..a8351024c362 100644 --- a/media-radio/ibp/ChangeLog +++ b/media-radio/ibp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/ibp -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ChangeLog,v 1.4 2010/10/24 15:33:31 phajdan.jr Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ChangeLog,v 1.5 2012/11/12 19:14:37 tomjbe Exp $ + + 12 Nov 2012; Thomas Beierlein <tomjbe@gentoo.org> ibp-0.21.ebuild, + -files/ibp-0.21-ldflags.patch: + Respect CFLAGS, do not use cc (bug #440900). Thanks Diego 24 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> ibp-0.21.ebuild: x86 stable wrt bug #341469 diff --git a/media-radio/ibp/files/ibp-0.21-ldflags.patch b/media-radio/ibp/files/ibp-0.21-ldflags.patch deleted file mode 100644 index d33103b4d833..000000000000 --- a/media-radio/ibp/files/ibp-0.21-ldflags.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- Imakefile.old 2010-10-19 08:44:15.000000000 +0200 -+++ Imakefile 2010-10-19 08:43:56.000000000 +0200 -@@ -1,3 +1,4 @@ -+LOCAL_LDFLAGS = $(LDFLAGS) - SYS_LIBRARIES = -lX11 -lm -lcurses - SRCS = ibp.c xdisp.c large.bits.h - OBJS = ibp.o xdisp.o diff --git a/media-radio/ibp/ibp-0.21.ebuild b/media-radio/ibp/ibp-0.21.ebuild index cc395c940c4b..dbd9cfb73211 100644 --- a/media-radio/ibp/ibp-0.21.ebuild +++ b/media-radio/ibp/ibp-0.21.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ibp-0.21.ebuild,v 1.4 2010/10/24 15:33:31 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ibp-0.21.ebuild,v 1.5 2012/11/12 19:14:37 tomjbe Exp $ -EAPI="2" - -inherit eutils +EAPI="4" +inherit eutils toolchain-funcs DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)" HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}.html" @@ -21,16 +20,28 @@ DEPEND="${RDEPEND} X? ( x11-misc/imake )" src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags.patch + # respect CFLAGS if built without USE=X + sed -i -e "s/= -D/+= -D/" Makefile || die } src_configure() { - if ( use X ) ;then - xmkmf || die " xmkmf failed" + if use X ;then + xmkmf || die + fi +} + +src_compile() { + if use X ; then + emake \ + CC="$(tc-getCC)" \ + LOCAL_LDFLAGS="${LDFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" + else + emake CC="$(tc-getCC)" fi } src_install() { - dobin ${PN} || die - doman ${PN}.1 || die + dobin ${PN} + doman ${PN}.1 } |