diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-13 23:41:52 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-13 23:41:52 +0000 |
| commit | 22393713ac5ffea1926d631d9be9780b0f5fcb05 (patch) | |
| tree | a48e96d21ca74f09d8083bf564abbb9d3079a835 /x11-misc/habak | |
| parent | ktoblzcheck bump (diff) | |
| download | gentoo-2-22393713ac5ffea1926d631d9be9780b0f5fcb05.tar.gz gentoo-2-22393713ac5ffea1926d631d9be9780b0f5fcb05.tar.bz2 gentoo-2-22393713ac5ffea1926d631d9be9780b0f5fcb05.zip | |
Fix --as-needed (bug #141709), make it respect the CC variable, die on build failure, make it build with parallel make.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'x11-misc/habak')
| -rw-r--r-- | x11-misc/habak/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/habak/habak-0.2.5.ebuild | 25 |
2 files changed, 25 insertions, 6 deletions
diff --git a/x11-misc/habak/ChangeLog b/x11-misc/habak/ChangeLog index f7f8b8bfc639..52b812f3daac 100644 --- a/x11-misc/habak/ChangeLog +++ b/x11-misc/habak/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/habak # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/ChangeLog,v 1.37 2008/11/13 23:28:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/ChangeLog,v 1.38 2008/11/13 23:41:52 flameeyes Exp $ + + 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> habak-0.2.5.ebuild: + Fix --as-needed (bug #141709), make it respect the CC variable, die on + build failure, make it build with parallel make. 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> habak-0.2.5.ebuild: Revert the "fix" for --as-needed, since it's actually breaking it more. diff --git a/x11-misc/habak/habak-0.2.5.ebuild b/x11-misc/habak/habak-0.2.5.ebuild index 9ffa29be34fb..2fd268063154 100644 --- a/x11-misc/habak/habak-0.2.5.ebuild +++ b/x11-misc/habak/habak-0.2.5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/habak-0.2.5.ebuild,v 1.18 2008/11/13 23:28:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/habak-0.2.5.ebuild,v 1.19 2008/11/13 23:41:52 flameeyes Exp $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="A simple but powerful tool to set desktop wallpaper" HOMEPAGE="http://lubuska.zapto.org/~hoppke/" @@ -18,6 +18,10 @@ RDEPEND="media-libs/imlib2 DEPEND="${RDEPEND} x11-proto/xproto" +# Skip into the src directory so we avoid a recursive make call that +# is going to break parallel make. +S="${WORKDIR}/${P}/src" + pkg_setup() { # fix for bug #185144 if ! built_with_use media-libs/imlib2 X; then @@ -27,11 +31,22 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + + sed -i \ + -e '/(LDFLAGS)/s:$: -lImlib2 -lm:' \ + -e 's:gcc:$(CC):' \ + "${S}"/Makefile || die "Makefile fixing failed" +} + src_compile() { - emake || die "make failed" + emake CC="$(tc-getCC)" ${PN} || die "make failed" } src_install() { - dobin habak - dodoc ChangeLog README TODO COPYING "${FILESDIR}"/README.en + dobin ${PN} || die "dobin failed" + + cd "${WORKDIR}/${P}" + dodoc ChangeLog README TODO "${FILESDIR}"/README.en || die "dodoc failed" } |