diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-02-19 19:15:48 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-02-19 19:15:48 +0000 |
| commit | 8115ecfa3ccd11f50c4473f10434bc0988395e96 (patch) | |
| tree | 116601d1a71a5eb5e553d069a96e9e3ce77f6af7 /app-benchmarks | |
| parent | Version bump, add a patch to workaround test failures. Drop old unused patch ... (diff) | |
| download | historical-8115ecfa3ccd11f50c4473f10434bc0988395e96.tar.gz historical-8115ecfa3ccd11f50c4473f10434bc0988395e96.tar.bz2 historical-8115ecfa3ccd11f50c4473f10434bc0988395e96.zip | |
Fix build with GCC 4.7 (bug #422577).
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463
Diffstat (limited to 'app-benchmarks')
| -rw-r--r-- | app-benchmarks/bashmark/ChangeLog | 8 | ||||
| -rw-r--r-- | app-benchmarks/bashmark/Manifest | 19 | ||||
| -rw-r--r-- | app-benchmarks/bashmark/bashmark-0.6.2.ebuild | 11 | ||||
| -rw-r--r-- | app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch | 29 |
4 files changed, 58 insertions, 9 deletions
diff --git a/app-benchmarks/bashmark/ChangeLog b/app-benchmarks/bashmark/ChangeLog index b7510bd22620..8e25741b4a47 100644 --- a/app-benchmarks/bashmark/ChangeLog +++ b/app-benchmarks/bashmark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-benchmarks/bashmark -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.13 2010/05/22 11:49:44 tove Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.14 2013/02/19 19:15:42 dirtyepic Exp $ + + 19 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> bashmark-0.6.2.ebuild, + +files/bashmark-0.6.2-gcc47.patch: + Fix build with GCC 4.7 (bug #422577). 22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml: Remove genstef from metadata.xml (#66339) diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest index 57c93167ab94..dd2ee1c7b991 100644 --- a/app-benchmarks/bashmark/Manifest +++ b/app-benchmarks/bashmark/Manifest @@ -1,6 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX bashmark-0.6.2-as-needed.patch 362 SHA256 e15a0052cb6ca674369f979926cb6974962ec57e810599b50059c92e1c1506af SHA512 123afc84ec7131492054d28d6e41f32730328298fcb5f13055a56277d1c286352a3ff70d759fb307dc960fba413ad31102f04bf5b5df55d6052743d26b7bcad4 WHIRLPOOL 648d5620a55b1c1de8b023b0dcfca82be399fc65681824f30ee32972b301ecce7dc70c45bdfface961eef65d079df75493b7869d4f0a8b47346746a6c4431eda AUX bashmark-0.6.2-gcc43.patch 2034 SHA256 72018c7fe756c8caa375acb43fc640d4ffb5989e773dcdcea8f370f66af08fb6 SHA512 48d1d0b2924d3640e8939f44989528a9a83fb56e436da21abb9301bbbbed28dbf2fa5e46b6631ac09531ed1ef218da685d21d5b3aeb48f147d56a1aa161bf09c WHIRLPOOL e0d21716c80be20c12310a77d42cb17f19ba9616e29c16dd4f0a6f5eac40dc6b5115001e6c4a85018df8d4ff35768745e3931b18a2421fd26ee4c50f68c518db +AUX bashmark-0.6.2-gcc47.patch 631 SHA256 089fed2a3c7200dbf6a4eaf647079dce41f172d984c43d1c283869fd5d1ea69c SHA512 60b1c1dd529d7dcac0893f1cc5d74e5fdcecb2bfd5735e33c6445d9fbaa843258b9aaaee9627ba98db1f8237f4567b8868f4be483b681b130d5a34943d2d24b6 WHIRLPOOL c79364639556eaa5b65229791dabc7eca053e3e2a0cb80cfa3ad11e698d51c9449c8b6b6494984df5907aac1aadf463db6ce285374458ebb6a315897ad8b0b0d DIST bashmark-0.6.2.tar.bz2 21944 SHA256 cdef5531069ccb9242a6c0ae3298be85053784782c4fe4a9d9518215dd2f085f SHA512 43935b44c1b871d724aca0e1a6dfd99c73c29ec276c4127186e8dc6c7b27d57554b8b32a7e2372cd0b78eb584df7ee169f51f47e6666f61eaacbe35c5d4074f8 WHIRLPOOL 93b0596d69819fecf2969edb132466d24fba4cc9a1f5d2ba5cac5a95735dd34af133afb01beca8f9588f62812c76b043acf13554dacec148636f4bbed1deff9d -EBUILD bashmark-0.6.2.ebuild 639 SHA256 5e3714f52b4cdb9a7738e81d8acf446cbc81ec3f5bbc8282ffda45af7c893d4f SHA512 0fd99ab970a1de808950cc5dc587512bfecfc34ae0a58eaaf2962877ac3341d54aaed0316b8cdb7d1ac412b79df3296c20bce2a27cc927dbde9a86c3594bd134 WHIRLPOOL 61f8e3fdcf026068b3658b02cda8b1fc5ef5b387a92fe4ed3d46e3fb33304a9835f4921cfdc212b35102f48034b1635dfc891216dddaefad7c0f15f05d3b7173 -MISC ChangeLog 2129 SHA256 1e1835f565ecf2816d708fb734cb9912a61039c142cfa1670762f28334ab6048 SHA512 455fd2242045da7f551eb3a6d7b5ac1999475d31aa6c6f93df6a9ec41828cda6f89030433f6ca275b1408d599ee1dc1c24424acef0e2f6c5900b030cbcebef69 WHIRLPOOL c19b6673d894170eed188e20f4a32a2f725ca31724d276f56de0ecfa585210f2fb63a3d883a0cc049b9dc41ab242492a0b45423c0a83d3f7793855b9b73d0e1a +EBUILD bashmark-0.6.2.ebuild 664 SHA256 428aca8a8c125f3b7f8b88828eecc4268d26a98545a97586fc821f86b8c3b028 SHA512 f0e9a8abe5c7250b0692ddd1c6c684a8eec08bd3cea4f5e65009dd2b2039370f3b5fa34f5144e10db197a2f7889af75b330532146aa4d7a59495a89a5a66521c WHIRLPOOL 7118f2e2f7a283788178c9bbcda7e7eefbcf80b637bf3d71ce37b82ed41e8bfe9b513b46d0a5051514f289056c646c4daa425e7e5eca019be7e91c22d04518a8 +MISC ChangeLog 2283 SHA256 aaf36e7dd907ee895cdfcbf38b61d24ac2468f6cd60ade9a521006a072eedd05 SHA512 e35619656400dc642e4497df4c6e848e9a9d932421295123199698a1c2b91617b91c9c8365f0419f2d650c718e75786f2ffa65af6f06f9d9198357cdd1408f8c WHIRLPOOL fad647c2066a19e1566049f85ce7fd7e3c700cb9572154d24934c27dcecd852742f6bc59cc615f435e678cae2a0f1d58f1606b7975ee4d7e59a125adf4279750 MISC metadata.xml 165 SHA256 8fe4fb4412e957b05d62c667e66a8f446402696f85d49ac92968cfeae7955b68 SHA512 3bcdbe570d32d8fefee91ec2a8f4126987aa94f0feb0a9d31510540abd97eb6f2352c4da38daffd7ba1161a91757da06f1be3d6bba9a89daae607f1f5a063ce3 WHIRLPOOL e9f6696ee73eaaa2c73d89e3aaddc203c106b63debbdeb11ee79c1fe54fec1a166d46fd1c09add91d17da114c8a972d0f1060e4fac5ed97dcc2bba27f20b3f59 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRI9HrAAoJEO04vUmVeoRjJq8IAKw9+JdfNv5k/VyvogaDKqlS +TVdf/nl5IW3VeS31eXad5A6R89Bi+ZrqPJCe7qhuXXK66E6AqFxxwYgFRFRtg5nK +6sLK7hAwvwjyjS2pT2X/hwDtNVCcopiXEt4SKWU8D/RWxUkKH99uQ6URl6l8AvBP +xS2eru6EiTE2Z/zNMKKi/tfY8cO2Fht9T1t8eUnpN21YhHz6Z3v3MY7gt2M5C8Yu +ZrlyMS0sN4iBT7wXyB9BHqcCmrIAyzfMXyyzzNYd1XX8EX2+5ZY4kGc2XAGWeFxr +LlcoGX4QezCuyDuubwFAWOED5R19WAqw0g+tuHb8wo6Hav12W32xNkbUz8yTqe4= +=6sWD +-----END PGP SIGNATURE----- diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild index 58902dd3353c..ea59c3ee96a0 100644 --- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild +++ b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.5 2008/06/29 10:00:27 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.6 2013/02/19 19:15:42 dirtyepic Exp $ + +EAPI=5 inherit eutils @@ -13,11 +15,10 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-as-needed.patch epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-gcc47.patch } src_install() { diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch new file mode 100644 index 000000000000..cb26d32b1fd6 --- /dev/null +++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch @@ -0,0 +1,29 @@ + https://bugs.gentoo.org/422577 + + error: 'usleep' was not declared in this scope + + + Benchmark.cpp | 1 + + main.cpp | 1 + + 2 files changed, 2 insertions(+) + +--- a/Benchmark.cpp ++++ b/Benchmark.cpp +@@ -18,6 +18,7 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * + ***************************************************************************/ + #include <cstring> ++#include <unistd.h> + #include "Benchmark.hpp" + #include "Stopwatch.hpp" + #include "Main.hpp" +--- a/main.cpp ++++ b/main.cpp +@@ -20,6 +20,7 @@ + + #include <sstream> + #include <cstring> ++#include <unistd.h> + using std::stringstream; + + |