From: Saleem Abdulrasool Date: Wed, 31 Jan 2007 20:48:49 +0000 (+0000) Subject: patch to fix compiling with gcc 4.x X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22ce8dbc22f6643337c6a7ac135832f4e844f465;p=gentoo.git patch to fix compiling with gcc 4.x Package-Manager: portage-2.1.2-r5 --- diff --git a/app-portage/herdstat/ChangeLog b/app-portage/herdstat/ChangeLog index a1c7123b6ca8..37b07b3eb2f8 100644 --- a/app-portage/herdstat/ChangeLog +++ b/app-portage/herdstat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/herdstat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.71 2007/01/24 03:42:33 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.72 2007/01/31 20:48:49 compnerd Exp $ + + 31 Jan 2007; Saleem Abdulrasool + +files/herdstat-1.1.91-undefined-lhp.patch, herdstat-1.1.91.ebuild: + Patch to fix compiling with gcc 4.x 24 Jan 2007; Marius Mauch herdstat-1.1.1_p7.ebuild, herdstat-1.1.2.ebuild, herdstat-1.1.91.ebuild: diff --git a/app-portage/herdstat/Manifest b/app-portage/herdstat/Manifest index 06626f420a11..b27449c00250 100644 --- a/app-portage/herdstat/Manifest +++ b/app-portage/herdstat/Manifest @@ -1,6 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX herdstat-1.1.91-undefined-lhp.patch 619 RMD160 0d4437f391e781df3a1b8e3d617cf7c9efbc0fe2 SHA1 659fda1a3a35cdc0b651943c0a11ebee0fb15dae SHA256 a65617822f25d1cbfd90af3bdf914673300b404c4341e9c162e46a162f852b93 +MD5 3af990064ad2846a7e30f0c6475e596d files/herdstat-1.1.91-undefined-lhp.patch 619 +RMD160 0d4437f391e781df3a1b8e3d617cf7c9efbc0fe2 files/herdstat-1.1.91-undefined-lhp.patch 619 +SHA256 a65617822f25d1cbfd90af3bdf914673300b404c4341e9c162e46a162f852b93 files/herdstat-1.1.91-undefined-lhp.patch 619 DIST herdstat-1.1.1_p7.tar.bz2 697861 RMD160 c3041e90fca5aebe3d7d61e6de80c82df9e39f92 SHA1 58501b664ae4fcc1b6f80ed889581a53a4d352e3 SHA256 3dde1d9fe876a997fe28eed296d9fed868a357cd9a78acfb902988cc17faf2a6 DIST herdstat-1.1.2.tar.bz2 201093 RMD160 fefba5c6f4ead7ebe543c1ec74a00249678b645e SHA1 bb6908528aac881d93dc3fbbd38d26a20a535fed SHA256 d1c3379a98f15e34e830e1881de72e6daf8b13bdc01dbd0552263985adab7693 DIST herdstat-1.1.91.tar.bz2 366562 RMD160 8f1330d85673e8ff58d3bab0eed9495235595463 SHA1 890bb1f7d4d635e5165d397f699866fb172d7050 SHA256 fbf47c2502c85c522832b4ef4ef5264e7c3addc5bcf7de6b549257ae6122b8eb @@ -14,14 +15,14 @@ EBUILD herdstat-1.1.2.ebuild 2077 RMD160 d0401389448acb56bd2c705647ec7be95444514 MD5 ae8ca64eb3763687fefd8dbc7bee28d0 herdstat-1.1.2.ebuild 2077 RMD160 d0401389448acb56bd2c705647ec7be954445143 herdstat-1.1.2.ebuild 2077 SHA256 bbd4746436a00c9772939749f81ad41b4a699d08244a5352be7d635cb917db66 herdstat-1.1.2.ebuild 2077 -EBUILD herdstat-1.1.91.ebuild 2536 RMD160 1ddfedb3df06652cd1dd7dea80298e301590d98b SHA1 6990ad16d36e28928ccaf650a4e984427573574c SHA256 3a3571ae22a9a4488439ef426022f04e219bb028a4168cf169c77c2c57e916fd -MD5 4d1ec51da29372f5f8b2c5691fe548ff herdstat-1.1.91.ebuild 2536 -RMD160 1ddfedb3df06652cd1dd7dea80298e301590d98b herdstat-1.1.91.ebuild 2536 -SHA256 3a3571ae22a9a4488439ef426022f04e219bb028a4168cf169c77c2c57e916fd herdstat-1.1.91.ebuild 2536 -MISC ChangeLog 10318 RMD160 0f61c26edbe2cf0e4a571986948b3ede0942be1d SHA1 a9b6ce0f3769619f194e7901fec9aae64de41cef SHA256 69e4d3efa86ac288278638de1d1088d1b1322e3285227e8479b432aa5d76753e -MD5 f89fa19734305449aaf5fd2248e45108 ChangeLog 10318 -RMD160 0f61c26edbe2cf0e4a571986948b3ede0942be1d ChangeLog 10318 -SHA256 69e4d3efa86ac288278638de1d1088d1b1322e3285227e8479b432aa5d76753e ChangeLog 10318 +EBUILD herdstat-1.1.91.ebuild 2632 RMD160 77c1cb7bd89bd660a27e8a23b2d197ee46c12883 SHA1 d87e17f49a5ddbcd20f78b984c43cd88c291d596 SHA256 bdf645971eb4628edb056e6d7053c14305b3e39bd479faa44b2115c00b6eac24 +MD5 e34dfaaf0e99c136cf9a70fdd833b1d0 herdstat-1.1.91.ebuild 2632 +RMD160 77c1cb7bd89bd660a27e8a23b2d197ee46c12883 herdstat-1.1.91.ebuild 2632 +SHA256 bdf645971eb4628edb056e6d7053c14305b3e39bd479faa44b2115c00b6eac24 herdstat-1.1.91.ebuild 2632 +MISC ChangeLog 10485 RMD160 dcc8587c386fc6cfd068ff8418b513fdf9752224 SHA1 ab1af86d4350a1a11575b50cad1923b197c706f3 SHA256 14d725deaf044f4d5a1df5136d22318c7eb390b01c640d998d05913b8a6a713d +MD5 bebd1c00cdde2c312784ccffeda066c9 ChangeLog 10485 +RMD160 dcc8587c386fc6cfd068ff8418b513fdf9752224 ChangeLog 10485 +SHA256 14d725deaf044f4d5a1df5136d22318c7eb390b01c640d998d05913b8a6a713d ChangeLog 10485 MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254 @@ -35,10 +36,3 @@ SHA256 69140a88dbe35066ce25aee16e876293f06117e1e802f23d8901c44b33b186d9 files/di MD5 cdd47ccfe3ae888c5cda0da607c46a0c files/digest-herdstat-1.1.91 533 RMD160 fa50f02dc1cce3fc2e66c3daf2c5a5662d2a39aa files/digest-herdstat-1.1.91 533 SHA256 1529910d87d008a5ad9a8b6036f7d5d196e257025120c7e44ddd2c5018fec334 files/digest-herdstat-1.1.91 533 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFtthH6J2i8a8J4okRAsJUAKDQjVPpTMsoT6WrmBh0OKhl8khOIQCgzrQq -BsbIwC/OgQbNmEd1k2Ovlu8= -=0Oq2 ------END PGP SIGNATURE----- diff --git a/app-portage/herdstat/files/herdstat-1.1.91-undefined-lhp.patch b/app-portage/herdstat/files/herdstat-1.1.91-undefined-lhp.patch new file mode 100644 index 000000000000..c77a05751ad8 --- /dev/null +++ b/app-portage/herdstat/files/herdstat-1.1.91-undefined-lhp.patch @@ -0,0 +1,22 @@ +--- src/io/handler.hh 2007-01-31 01:55:13.000000000 -0600 ++++ src/io/handler.hh 2007-01-31 01:53:51.000000000 -0600 +@@ -34,6 +34,8 @@ + #include "handler_map.hh" + #include "action/handler.hh" + ++extern HandlerMap *lhp; ++ + /** + * @class IOHandler + * @brief Input/Output handler base class. All front-ends ultimately derive +--- src/io/handler.cc 2007-01-31 01:55:00.000000000 -0600 ++++ src/io/handler.cc 2007-01-31 01:51:09.000000000 -0600 +@@ -36,7 +36,7 @@ + + using namespace herdstat; + +-extern HandlerMap *lhp; ++HandlerMap *lhp; + + IOHandler::IOHandler() + : _local() diff --git a/app-portage/herdstat/herdstat-1.1.91.ebuild b/app-portage/herdstat/herdstat-1.1.91.ebuild index 2f4fb3c40e97..a8613e9471d3 100644 --- a/app-portage/herdstat/herdstat-1.1.91.ebuild +++ b/app-portage/herdstat/herdstat-1.1.91.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.91.ebuild,v 1.2 2007/01/24 03:42:33 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.91.ebuild,v 1.3 2007/01/31 20:48:49 compnerd Exp $ inherit bash-completion eutils @@ -30,6 +30,13 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-1.1.91-undefined-lhp.patch +} + src_compile() { econf \ --with-test-data=${WORKDIR}/${TEST_DATA_P} \