summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-09-30 04:45:48 +0000
committerJeroen Roovers <jer@gentoo.org>2009-09-30 04:45:48 +0000
commitd3a498df6aba2e9b281ef2538e88f9cc03dc2984 (patch)
tree842f268b66625b6f9090ec69c4e8d54b7c750ba5 /x11-misc/dzen
parentmask python[berkdb] due to build failure and the fact that it is going away s... (diff)
downloadgentoo-2-d3a498df6aba2e9b281ef2538e88f9cc03dc2984.tar.gz
gentoo-2-d3a498df6aba2e9b281ef2538e88f9cc03dc2984.tar.bz2
gentoo-2-d3a498df6aba2e9b281ef2538e88f9cc03dc2984.zip
Respect LDFLAGS. Do not set CFLAGS/CC in stone (bug #241540).
(Portage version: 2.2_rc42/cvs/Linux i686)
Diffstat (limited to 'x11-misc/dzen')
-rw-r--r--x11-misc/dzen/ChangeLog7
-rw-r--r--x11-misc/dzen/dzen-0.8.5.ebuild11
2 files changed, 12 insertions, 6 deletions
diff --git a/x11-misc/dzen/ChangeLog b/x11-misc/dzen/ChangeLog
index 46c9f5f4926a..c5a98cfc0ed8 100644
--- a/x11-misc/dzen/ChangeLog
+++ b/x11-misc/dzen/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/dzen
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.7 2008/02/04 16:23:32 coldwind Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.8 2009/09/30 04:45:48 jer Exp $
+
+ 30 Sep 2009; Jeroen Roovers <jer@gentoo.org> dzen-0.8.5.ebuild:
+ Respect LDFLAGS. Do not set CFLAGS/CC in stone (bug #241540).
04 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> dzen-0.8.5.ebuild:
amd64 stable, #206541
diff --git a/x11-misc/dzen/dzen-0.8.5.ebuild b/x11-misc/dzen/dzen-0.8.5.ebuild
index d91ad0a41082..13ef828a3d18 100644
--- a/x11-misc/dzen/dzen-0.8.5.ebuild
+++ b/x11-misc/dzen/dzen-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.8.5.ebuild,v 1.4 2008/02/04 16:23:32 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.8.5.ebuild,v 1.5 2009/09/30 04:45:48 jer Exp $
inherit toolchain-funcs multilib
@@ -28,8 +28,10 @@ src_unpack() {
unpack ${A}
cd "${S}"
sed -e "s:/usr/local:/usr:g" \
- -e "s:-Os:${CFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):" \
+ -e 's:-Os::g' \
+ -e "s:CFLAGS =:CFLAGS +=:g" \
+ -e '/^CC.*/d' \
+ -e 's:^LDFLAGS =:LDFLAGS +=:' \
-e "s:/usr/lib :/usr/$(get_libdir):" \
-i config.mk gadgets/config.mk || die "sed failed"
sed -i -e "/strip/d" Makefile gadgets/Makefile || die "sed failed"
@@ -46,6 +48,7 @@ src_unpack() {
}
src_compile() {
+ tc-export CC
emake || die "emake failed"
if ! use minimal ; then