From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6014A138334 for ; Mon, 18 Nov 2019 22:17:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E07BE0844; Mon, 18 Nov 2019 22:17:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C538FE0845 for ; Mon, 18 Nov 2019 22:17:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DFC434D00E for ; Mon, 18 Nov 2019 22:17:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0856B26C for ; Mon, 18 Nov 2019 22:17:26 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1574115343.65be439d3c9e151727ad05c7a13502536940120c.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lcov/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/lcov/files/lcov-1.9-gcc-4.7.patch X-VCS-Directories: dev-util/lcov/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 65be439d3c9e151727ad05c7a13502536940120c X-VCS-Branch: master Date: Mon, 18 Nov 2019 22:17:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25390520-73c7-446a-a5cf-149b709615e3 X-Archives-Hash: 1de31c89d4374c6ea0add5858f6e993b commit: 65be439d3c9e151727ad05c7a13502536940120c Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Nov 18 10:35:34 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Mon Nov 18 22:15:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65be439d dev-util/lcov: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13695 Signed-off-by: Aaron Bauman gentoo.org> dev-util/lcov/files/lcov-1.9-gcc-4.7.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) 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 deleted file mode 100644 index 1b9d6ac0ff2..00000000000 --- a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch +++ /dev/null @@ -1,29 +0,0 @@ -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");