diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-08-07 09:02:33 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-08-07 09:02:33 +0000 |
| commit | 7b6ff219e149740ca1a6ddfe5b152f85c6695c90 (patch) | |
| tree | a51e559fd172dc01c116edfaa1e42690ea8b031c /dev-util/apitrace | |
| parent | Rename patch because it is more generally applicable as a QA fix. Apply patch... (diff) | |
| download | gentoo-2-7b6ff219e149740ca1a6ddfe5b152f85c6695c90.tar.gz gentoo-2-7b6ff219e149740ca1a6ddfe5b152f85c6695c90.tar.bz2 gentoo-2-7b6ff219e149740ca1a6ddfe5b152f85c6695c90.zip | |
Fix build with gcc-4.7 (bug #424731).
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/apitrace')
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-3.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-3.0-gcc47.patch | 39 |
3 files changed, 46 insertions, 2 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index 609d2065649f..750621f36796 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/apitrace # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.11 2012/03/18 22:55:18 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.12 2012/08/07 09:02:33 radhermit Exp $ + + 07 Aug 2012; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild, + +files/apitrace-3.0-gcc47.patch: + Fix build with gcc-4.7 (bug #424731). 18 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-3.0.ebuild: Remove old. diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild index 1a59227884bc..7ff2e103c14c 100644 --- a/dev-util/apitrace/apitrace-3.0-r1.ebuild +++ b/dev-util/apitrace/apitrace-3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.1 2012/03/18 21:35:32 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.2 2012/08/07 09:02:33 radhermit Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -39,6 +39,7 @@ EMULTILIB_PKG="true" PATCHES=( "${FILESDIR}"/${P}-system-libs.patch "${FILESDIR}"/${P}-glxtrace-only.patch + "${FILESDIR}"/${PN}-3.0-gcc47.patch ) pkg_setup() { diff --git a/dev-util/apitrace/files/apitrace-3.0-gcc47.patch b/dev-util/apitrace/files/apitrace-3.0-gcc47.patch new file mode 100644 index 000000000000..37e87fc93500 --- /dev/null +++ b/dev-util/apitrace/files/apitrace-3.0-gcc47.patch @@ -0,0 +1,39 @@ +From bdd9281dd964c36ac94ef3a9fd5d4f7dd24a3d06 Mon Sep 17 00:00:00 2001 +From: Martin Olsson <martin@minimum.se> +Date: Mon, 26 Mar 2012 10:40:45 +0200 +Subject: [PATCH] Fix compile error "isatty was not declared"; missing + unistd.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When I built apitrace on Fedora 16, using the usual: + + cmake -H. -Bbuild + make -C build + +...then I got this compile error: + + apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’: + apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope +--- + cli/cli_dump.cpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp +index 28c91af..f52b83c 100644 +--- a/cli/cli_dump.cpp ++++ b/cli/cli_dump.cpp +@@ -28,6 +28,9 @@ + #include <string.h> + #include <limits.h> // for CHAR_MAX + #include <getopt.h> ++#ifndef _WIN32 ++#include <unistd.h> // for isatty() ++#endif + + #include "cli.hpp" + #include "cli_pager.hpp" +-- +1.7.8.6 + |