diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2013-02-19 19:15:42 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-02-19 19:15:42 +0000 |
| commit | 61387e964bff04f3af6acef0a243c95d6ad590b3 (patch) | |
| tree | ed5cfdb6e931da9bc2e66f69818d95b7e56ee88e /app-benchmarks | |
| parent | Stable for alpha, wrt bug #458122 (diff) | |
| download | gentoo-2-61387e964bff04f3af6acef0a243c95d6ad590b3.tar.gz gentoo-2-61387e964bff04f3af6acef0a243c95d6ad590b3.tar.bz2 gentoo-2-61387e964bff04f3af6acef0a243c95d6ad590b3.zip | |
Fix build with GCC 4.7 (bug #422577).
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Diffstat (limited to 'app-benchmarks')
| -rw-r--r-- | app-benchmarks/bashmark/ChangeLog | 8 | ||||
| -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 |
3 files changed, 41 insertions, 7 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/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; + + |