Fix from upstream for working with gcc-4.7.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

3 files changed, 66 insertions, 2 deletions

diff --git a/dev-util/lcov/ChangeLog b/dev-util/lcov/ChangeLog
index 512cc1e13fc0..bc96c196a316 100644
--- a/dev-util/lcov/ChangeLog
+++ b/dev-util/lcov/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/lcov
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/ChangeLog,v 1.9 2012/05/29 20:05:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/ChangeLog,v 1.10 2012/06/27 22:01:30 vapier Exp $
+
+*lcov-1.9-r1 (27 Jun 2012)
+
+  27 Jun 2012; Mike Frysinger <vapier@gentoo.org> +files/lcov-1.9-gcc-4.7.patch,
+  +lcov-1.9-r1.ebuild:
+  Fix from upstream for working with gcc-4.7.
 
   29 May 2012; Brent Baude <ranger@gentoo.org> lcov-1.9.ebuild:
   Marking lcov-1.9 ppc for bug 406191
@@ -34,4 +40,3 @@
 
   24 Oct 2008; Olivier Crête <tester@gentoo.org> ChangeLog:
   Initial import of lcov, from bug #100803. Ebuild contributed by Ryo Kuya
-
diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
new file mode 100644
index 000000000000..1b9d6ac0ff21
--- /dev/null
+++ b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
@@ -0,0 +1,29 @@
+fix from upstream to work with gcc-4.7
+
+Index: bin/geninfo
+===================================================================
+RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
+retrieving revision 1.95
+retrieving revision 1.96
+diff -u -p -r1.95 -r1.96
+--- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
++++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
+@@ -61,6 +61,7 @@ if( $^O eq "msys" )
+ our $gcov_tool		= "gcov";
+ our $tool_name		= basename($0);
+ 
++our $GCOV_VERSION_4_7_0	= 0x40700;
+ our $GCOV_VERSION_3_4_0	= 0x30400;
+ our $GCOV_VERSION_3_3_0	= 0x30300;
+ our $GCNO_FUNCTION_TAG	= 0x01000000;
+@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
+ 	graph_expect("function record");
+ 	# Skip ident and checksum
+ 	graph_skip($handle, 8, "function ident and checksum") or return undef;
++	if ($gcov_version >= $GCOV_VERSION_4_7_0) {
++		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
++		# toolchains.
++		graph_skip($handle, 4, "function extra checksum");
++	}
+ 	# Read function name
+ 	graph_expect("function name");
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
new file mode 100644
index 000000000000..732df79d61f7
--- /dev/null
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/lcov-1.9-r1.ebuild,v 1.1 2012/06/27 22:01:30 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/GD[png]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${D}" install
+}