diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-10 12:00:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-10 12:00:18 +0000 |
| commit | 4178aaae721651d04ee63026573688b81df37d87 (patch) | |
| tree | c416c538cf4d25aa59c3ec37cc18a2eb8874bc62 /app-emulation | |
| parent | Might as well tackle repoman issues too. (diff) | |
| download | historical-4178aaae721651d04ee63026573688b81df37d87.tar.gz historical-4178aaae721651d04ee63026573688b81df37d87.tar.bz2 historical-4178aaae721651d04ee63026573688b81df37d87.zip | |
Fix building with GCC 4.4+ wrt #278068.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/hercules/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/hercules/Manifest | 15 | ||||
| -rw-r--r-- | app-emulation/hercules/files/hercules-3.06-gcc44.patch | 12 | ||||
| -rw-r--r-- | app-emulation/hercules/hercules-3.06.ebuild | 3 |
4 files changed, 22 insertions, 14 deletions
diff --git a/app-emulation/hercules/ChangeLog b/app-emulation/hercules/ChangeLog index 90c12ee4c762..f5794467fe96 100644 --- a/app-emulation/hercules/ChangeLog +++ b/app-emulation/hercules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/hercules # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/ChangeLog,v 1.26 2009/02/28 10:18:10 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/ChangeLog,v 1.27 2009/08/10 12:00:17 ssuominen Exp $ + + 10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> hercules-3.06.ebuild, + +files/hercules-3.06-gcc44.patch: + Fix building with GCC 4.4+ wrt #278068. 28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml: custom-cflags is a global USE-flag diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest index 52df8abd0e78..bd15f9255386 100644 --- a/app-emulation/hercules/Manifest +++ b/app-emulation/hercules/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX hercules-3.06-build.patch 600 RMD160 816cf049946c34f5dce7c2b68848f89ec21e6c0a SHA1 e530d4e926c70a8ed7bda658d5c1ea10b8304391 SHA256 e4e70f398e24cc72207548319454d7e8cf64fa54e3e85908be67a0715b9b722b +AUX hercules-3.06-gcc44.patch 373 RMD160 4fa58fd756fe65b9ec2ec53cdb664501ce1bb1ce SHA1 61492a1db305cdbe05b374b3c25c97a50871cfd9 SHA256 b61175f1e9c607b4e1413695d022fbd71570bdda2866808ff7567841895ed125 DIST hercules-3.04.tar.gz 2079774 RMD160 ef13c0625eba2623648bbfeba73144e1cd87d6f4 SHA1 71fb216bcc840a973b2cfb78832c1a03d7bc3d51 SHA256 4512a7c2b86b4a92c337c99761295aa4eaa54e90da3d0881c283b69c03b1eed5 DIST hercules-3.05.tar.gz 2470621 RMD160 98013b1d2f642ea86f71a07638a90758de7b396e SHA1 7e1f58c326b3d52b9fdfe2384347a6e702c0ca72 SHA256 f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2 DIST hercules-3.06.tar.gz 2658262 RMD160 f4b55e8cd51fccf785f36d4951eb66973aa93d9f SHA1 d34c8e3ce9ed875fc040f706293cdcb928a50b65 SHA256 fa00b17c86a47133108c49973ba343d589f0e8777a115d827ef3da9aafbda22b EBUILD hercules-3.04.ebuild 907 RMD160 57f72bd33318f55bb062ef7e9363d4e4c54fd13f SHA1 566f5d6b1c765007ca84b552ce6714eb8bd21560 SHA256 33739174e1a75c0fce6218935587641693dc44692998c3199acdf7ee04b77af6 EBUILD hercules-3.05.ebuild 911 RMD160 7982499c379ed2d205fddca836bdd18b195d28c1 SHA1 20430ebe8318cb3dbfc499d16612cc732a240e96 SHA256 93a9f45c9b1ce281b9cd881d350c4b2891559b587b0401beab2e48c7e6f34e6d -EBUILD hercules-3.06.ebuild 1178 RMD160 4269ec5d4bf560f9ffc34f08bfe3dab74073632d SHA1 92668d6d61478a947a8a830a1dc766fe878e91af SHA256 1a81e3516e2429148debb393fe083aab9ea0260cab42af2b5f1b520acaaee82e -MISC ChangeLog 2897 RMD160 2f38c45a6044ae77e53dc019c3229048e2eada5c SHA1 4d4ac533b33344a67884b58dc409dc77724029c4 SHA256 5172b6da787703a3ad7c6393b449413aedb50b46769c2719c63cba382d97df8e +EBUILD hercules-3.06.ebuild 1220 RMD160 0393611418195e8df0a28b385fea12c9fed3cdfd SHA1 10fcca61fb4b55e25b122fac825a610e8a349623 SHA256 dc188e99ef6cd53a96a85f07bab8448a66f883e4a0e8af3c4482c285175fbec1 +MISC ChangeLog 3055 RMD160 f7d9396ebbe921f4356642098e7c8e4f1d084721 SHA1 6f55d95fb35aa7dc80d094a79c5a501116e1db67 SHA256 43c3fb7007e95d4d3ef1e81a3db63807fd1a123ca75419492fc16db9ba8c442d MISC metadata.xml 474 RMD160 d7cee5380c2fc1d8d33b5136c06bef17aed99a35 SHA1 954df6e127573ccbbb5533b8210a20e69bdfaa1b SHA256 1d248ce2197dc0dedcaecd01e23fa6bc133b12f33527782c952c5873141d335c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkmpD7MACgkQkKaRLQcq0GJQPQCgnUkwoO3dP2NMeU2O7ZjwoDJ4 -q1oAn21o1iLl7sK28jTuuLYa6UP8DRyV -=Arn9 ------END PGP SIGNATURE----- diff --git a/app-emulation/hercules/files/hercules-3.06-gcc44.patch b/app-emulation/hercules/files/hercules-3.06-gcc44.patch new file mode 100644 index 000000000000..e38c320dafbe --- /dev/null +++ b/app-emulation/hercules/files/hercules-3.06-gcc44.patch @@ -0,0 +1,12 @@ +diff -ur hercules-3.06.orig/hsccmd.c hercules-3.06/hsccmd.c +--- hercules-3.06.orig/hsccmd.c 2009-01-10 02:18:33.000000000 +0200 ++++ hercules-3.06/hsccmd.c 2009-08-10 14:59:34.000000000 +0300 +@@ -7676,7 +7676,7 @@ + break; + } + } +-#elif // OPTION_CMDTGT ++#else // OPTION_CMDTGT + #ifdef _FEATURE_SYSTEM_CONSOLE + if ('.' == cmd[0] || '!' == cmd[0]) + { diff --git a/app-emulation/hercules/hercules-3.06.ebuild b/app-emulation/hercules/hercules-3.06.ebuild index a31896978f01..28667f248d09 100644 --- a/app-emulation/hercules/hercules-3.06.ebuild +++ b/app-emulation/hercules/hercules-3.06.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/hercules-3.06.ebuild,v 1.3 2009/01/11 11:05:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/hercules-3.06.ebuild,v 1.4 2009/08/10 12:00:18 ssuominen Exp $ inherit eutils flag-o-matic @@ -17,6 +17,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-gcc44.patch sed -i \ -e 's:@modexecdir@:$(libdir)/$(PACKAGE):' \ -e '/^AM_CPPFLAGS/s:=:= -DMODULESDIR=\\"$(modexecdir)\\" :' \ |