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
commite82f66f28b4db64c714ab0ecf597e935a1fafaad (patch)
tree5d7f12c331069c56fca191657c7029e3dfff9ff4 /sci-electronics
parentAdd "hardened" USE flag, fixing bugs #120001, #167844 and probably more. (diff)
downloadhistorical-e82f66f28b4db64c714ab0ecf597e935a1fafaad.tar.gz
historical-e82f66f28b4db64c714ab0ecf597e935a1fafaad.tar.bz2
historical-e82f66f28b4db64c714ab0ecf597e935a1fafaad.zip
Fix handling of CFLAGS/CXXFLAGS/LDFLAGS so that now: LDFLAGS are respected, CXXFLAGS are not mixed with CFLAGS.
Package-Manager: portage-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/Manifest10
-rw-r--r--sci-electronics/gnucap/gnucap-0.35.20080324.ebuild9
3 files changed, 17 insertions, 9 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/Manifest b/sci-electronics/gnucap/Manifest
index 38969c6c094f..ba7740455091 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -26,14 +26,14 @@ EBUILD gnucap-0.35.20070221.ebuild 2062 RMD160 b451d0773c02a7a20f121accfb768cf42
EBUILD gnucap-0.35.20070820.ebuild 2343 RMD160 32b5730d8abf16e22bceaed02621fe485e12dcf6 SHA1 8e124836537a8b5b76d7e795b472b89790877c7a SHA256 53fb545697077f42038d57ae2997be33b4c31807a90739ad97792ff30704a2a3
EBUILD gnucap-0.35.20071121.ebuild 2343 RMD160 e23fb2486ffc352e26e27893347e094954af60f3 SHA1 c53b4c68a9549c7c945289539ea7482a7921c9ff SHA256 03a1c2a971d6a51248e087bbb6902497219ece4f6267ab9a5fc61419ee79bf96
EBUILD gnucap-0.35.20080211.ebuild 2064 RMD160 d895b4d26231aa95a20fe41a2b29fd331cc11fd4 SHA1 e2d0121ba89e82ee6154bebb52b8118e7adf6524 SHA256 ba9106d97113099a70d9b722f5460327bb1ea21727a494740180cf6b0515b8c7
-EBUILD gnucap-0.35.20080324.ebuild 2064 RMD160 39a540664709baecd63036a450df7ee14becd927 SHA1 fb9ade6fc54eac195ceaff7f7fd13dcc955f1b0b SHA256 08943cc041b151e76518fcb548e1cad84ce884e3784fc04ebb14b5748ebcffb7
+EBUILD gnucap-0.35.20080324.ebuild 2177 RMD160 74963fd23868dbdfbd4ee86fb3007a92821dbda5 SHA1 4511e69a7010746a54ae30f446907f3d3e49d3c1 SHA256 ca7c724b8530521c7e0d64ee5d491afd0c81e07f07c603fed945627212a77f9a
EBUILD gnucap-0.35.ebuild 1054 RMD160 dd66ad2b3b591815af69e574c18df87ae0e6c954 SHA1 e5931c6e9310a1ffc0aa3e58f59d3f895aeb6a37 SHA256 572d9724fb6347b229f3d21da9597d28f2ad659e889763d90f169c8b8d0d0d94
-MISC ChangeLog 6779 RMD160 03e3e477bea3c918283e4005aa6f9a0593a727a3 SHA1 bcee7135b71a6429987ee2abbca62d1cf0a2cbcd SHA256 57c1ea9c3ebcdc1ee10696c65e88f272d78b3cd8a167cd9af73fbc6be20d577c
+MISC ChangeLog 6982 RMD160 881153957a0cb8312cd61b05dc7ce9babca11efa SHA1 d76586570950c04e69a5abd65949026d98089c53 SHA256 711d4f81e45734a13f083c6d5735b35c6ff26cadde2cc32d95e4f1f0e18d8f68
MISC metadata.xml 639 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e SHA1 7c60875a5cf344f4c4ac272f1d49ecba5d813ae2 SHA256 ff13dbf0ea2bc18a97e2b456c50c0b57082e14e5bde50ebb04395d955e3d9076
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhnRL8ACgkQV3J2n04EauwI8ACgmL2PsMydcb6pkwXQHYlr2uLH
-ZPQAniRvgxEha6A1iwu71asKu9SVY2Er
-=Nl0K
+iEYEARECAAYFAkkOKkMACgkQAiZjviIA2Xh1YACaAvm0d4DVshleKHCeXjznN4Ed
+evMAoIQjEQWSeX6SMnXGluiOW4IptnmC
+=zmqw
-----END PGP SIGNATURE-----
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"
}