summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-02 22:31:20 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-02 22:31:20 +0000
commit98bb5bc71e1013988cfa7f2cd3f9e2de38b81c02 (patch)
treeb7a67a54c148f2bc8cd394216951957f168b73cb /sci-electronics
parentAdd "hardened" USE flag, fixing bugs #120001, #167844 and probably more. (diff)
downloadgentoo-2-98bb5bc71e1013988cfa7f2cd3f9e2de38b81c02.tar.gz
gentoo-2-98bb5bc71e1013988cfa7f2cd3f9e2de38b81c02.tar.bz2
gentoo-2-98bb5bc71e1013988cfa7f2cd3f9e2de38b81c02.zip
Fix handling of CFLAGS/CXXFLAGS/LDFLAGS so that now: LDFLAGS are respected, CXXFLAGS are not mixed with CFLAGS.
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/gnucap/ChangeLog7
-rw-r--r--sci-electronics/gnucap/gnucap-0.35.20080324.ebuild9
2 files changed, 12 insertions, 4 deletions
diff --git a/sci-electronics/gnucap/ChangeLog b/sci-electronics/gnucap/ChangeLog
index 172c154a45f5..d80490e17583 100644
--- a/sci-electronics/gnucap/ChangeLog
+++ b/sci-electronics/gnucap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-electronics/gnucap
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.41 2008/05/13 07:17:17 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.42 2008/11/02 22:31:20 flameeyes Exp $
+
+ 02 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+ gnucap-0.35.20080324.ebuild:
+ Fix handling of CFLAGS/CXXFLAGS/LDFLAGS so that now: LDFLAGS are
+ respected, CXXFLAGS are not mixed with CFLAGS.
13 May 2008; Denis Dupeyron <calchan@gentoo.org> gnucap-0.35.ebuild,
gnucap-0.35.20070221.ebuild, gnucap-0.35.20070820.ebuild,
diff --git a/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild b/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild
index 61f86e083fee..7d1c64561e9e 100644
--- a/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild,v 1.2 2008/05/13 07:17:17 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.20080324.ebuild,v 1.3 2008/11/02 22:31:20 flameeyes Exp $
inherit multilib
@@ -45,8 +45,11 @@ src_unpack() {
Makefile.in || die "sed failed"
fi
- sed -i -e "s:CFLAGS = -O2 -g:CFLAGS +=:" \
- -e "s:CCFLAGS = \$(CFLAGS):CCFLAGS += \$(CFLAGS):" \
+ sed -i -e 's:CFLAGS = -O2 -g:CPPFLAGS +=:' \
+ -e '/CCFLAGS =/i\CFLAGS += $(CPPFLAGS)' \
+ -e 's:CCFLAGS = $(CFLAGS):CXXFLAGS += $(CPPFLAGS):' \
+ -e 's:LDFLAGS = :LDFLAGS += :' \
+ -e 's:CCFLAGS:CXXFLAGS:' \
-e "s:../Gnucap:${S}/src:" \
models-*/Make2 || die "sed failed"
}