diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-10-14 14:47:14 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-10-14 14:47:14 +0000 |
| commit | 97c9f8edc79f27b606a01d376bbf680f104ed17d (patch) | |
| tree | c9d7b4611d5a619b9582435502a956c99681df40 | |
| parent | Bump to 0.10.5, take maintainership since it seems I'm stuck with it. (diff) | |
| download | historical-97c9f8edc79f27b606a01d376bbf680f104ed17d.tar.gz historical-97c9f8edc79f27b606a01d376bbf680f104ed17d.tar.bz2 historical-97c9f8edc79f27b606a01d376bbf680f104ed17d.zip | |
Fix CFLAGS handling so they get injected during src_compile rather than set in stone during src_unpack; properly respect LDFLAGS (they go before the object files, not after).
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64
| -rw-r--r-- | sys-apps/chpax/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/chpax/Manifest | 14 | ||||
| -rw-r--r-- | sys-apps/chpax/chpax-0.7.ebuild | 12 |
3 files changed, 26 insertions, 9 deletions
diff --git a/sys-apps/chpax/ChangeLog b/sys-apps/chpax/ChangeLog index 4ca1190157c1..4338bcdebe54 100644 --- a/sys-apps/chpax/ChangeLog +++ b/sys-apps/chpax/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/chpax -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.34 2006/12/19 22:38:19 solar Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.35 2008/10/14 14:47:14 flameeyes Exp $ + + 14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> chpax-0.7.ebuild: + Fix CFLAGS handling so they get injected during src_compile rather than + set in stone during src_unpack; properly respect LDFLAGS (they go before + the object files, not after). 19 Dec 2006; <solar@gentoo.org> chpax-0.7.ebuild: - make note about chpax being obsolete and suggest paxctl diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest index 49f25748d057..c84006fa0895 100644 --- a/sys-apps/chpax/Manifest +++ b/sys-apps/chpax/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX pax-conf.d 2743 RMD160 7fde742f746163fd226be6a4e1a7fbfcf006cff6 SHA1 0ac669f4220c53ff60c4dd148b37174187e8bf5b SHA256 548412a7569aa64d64d02171e6ac3f7295bf79908ff358730a9392023f408ae0 AUX pax-init.d 2536 RMD160 87284503356d6a2d06768dc2ebf9ba8de8a7f132 SHA1 a1ac9dadafec908c0bc6c964fe4a29edb0a1c4d9 SHA256 6eb236ac2efd3fbe977d52d78d08fdb8a065dc03d7241740073dc0234be3c80d DIST chpax-0.7.tar.gz 5255 RMD160 5c8aeb9f43b8831a07cca8a99723d15768b2f6a8 SHA1 da2b8d9c4cc57974b3c3cd7274c73058c9ea4be7 SHA256 9c6c12d486a0200c3060745dfe56c54ec67a6566499093e71e3f234dfc961c44 -EBUILD chpax-0.7.ebuild 1238 RMD160 ab8b792ac5458848a474ed99b74f0848b78835a4 SHA1 d020f71db44e53058fbc44f214572facc922fc23 SHA256 78c0a9a51bbf8914b5d34a6ff6bd25f44f712f242328b9170f46ce711ec25eab -MISC ChangeLog 4443 RMD160 41f22eb548a3e68043610848457b9a24631ffa6f SHA1 34ce60b9ca382b98baabadfaa7c8cc4f3544146d SHA256 cfe63e7f34cce365193b177fcebe8c97399c892f53b3ae39183790f178e28b58 +EBUILD chpax-0.7.ebuild 1285 RMD160 45b4f777131cf74b51446cb3eaf21bc442bd2fb4 SHA1 2ca9fa53ea416ddb57f3f6b265c7f46d5b0f7a14 SHA256 8b07f210a465ed4b01910bb4a62390a2e9bc0b4fcfae42cbde009472a8508667 +MISC ChangeLog 4700 RMD160 c8a229b05c1ff29a7a67cab759bff5e9e1bf2579 SHA1 f3ed5bc4f444fd66b6634978f5e0ec02f234828f SHA256 22e0f19bab720857d7b1ecb183f7c90a8fd08bd6ad08182614e52cc8dcac7d77 MISC metadata.xml 221 RMD160 36e39e492da72726b330a86dc95ede87e651d931 SHA1 6f6982410ef753962e2e4e8023f052ac90442059 SHA256 3a74e36f71a920efbf1527328945aff900bc54184c50c4da80f024d35a3e25f2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkj0sPwACgkQAiZjviIA2XhvGQCeO6eUisMuZC3Mk4DALLrVMi68 +K3cAoIQ0Zr+3q/KxwiR9W5IE9rPQJ90s +=MHIv +-----END PGP SIGNATURE----- diff --git a/sys-apps/chpax/chpax-0.7.ebuild b/sys-apps/chpax/chpax-0.7.ebuild index d5927cadd4fd..9847d97992de 100644 --- a/sys-apps/chpax/chpax-0.7.ebuild +++ b/sys-apps/chpax/chpax-0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.12 2006/12/19 22:38:19 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.13 2008/10/14 14:47:14 flameeyes Exp $ inherit flag-o-matic toolchain-funcs @@ -18,13 +18,15 @@ DEPEND="${RDEPEND}" src_unpack() { unpack ${A} - cd ${S} - sed -i -e "s|-Wall|${CFLAGS}|" Makefile + sed -i \ + -e '/^CFLAGS/s:=:+=:' \ + -e '/TARGET/s:CFLAGS:LDFLAGS:' \ + "${S}"/Makefile || die "sed in Makefile failed" } src_compile() { # use static && append-ldflags -static ; # breaks with current ssp. - emake CC="$(tc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed" + emake CC="$(tc-getCC)" || die "Parallel Make Failed" } src_install() { |