From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Oct 2018 12:48:57 +0100 Subject: gentoo resync : 27.10.2018 --- dev-util/lcov/Manifest | 6 +- dev-util/lcov/files/lcov-1.13-gcc-8.patch | 91 +++++++++++++++++++++++++++++++ dev-util/lcov/lcov-1.13-r1.ebuild | 31 ----------- dev-util/lcov/lcov-1.13-r2.ebuild | 43 +++++++++++++++ dev-util/lcov/lcov-9999.ebuild | 39 +++++++++++++ dev-util/lcov/metadata.xml | 4 ++ 6 files changed, 181 insertions(+), 33 deletions(-) create mode 100644 dev-util/lcov/files/lcov-1.13-gcc-8.patch delete mode 100644 dev-util/lcov/lcov-1.13-r1.ebuild create mode 100644 dev-util/lcov/lcov-1.13-r2.ebuild create mode 100644 dev-util/lcov/lcov-9999.ebuild (limited to 'dev-util/lcov') diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest index 778a5929fb0a..63c38f316c43 100644 --- a/dev-util/lcov/Manifest +++ b/dev-util/lcov/Manifest @@ -1,8 +1,10 @@ +AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94 AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307 DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd22a6ee52035115d84e7f05d7593168ffee9c5925937a509e3be64cebaad6e4694004ee2808817d6df19da SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb -EBUILD lcov-1.13-r1.ebuild 683 BLAKE2B 1f30b7d233031078f27b25789c2e6cbd9ec72339ed45e90d9082cf014fc4c8f002148db98fe8078b09201f597f2d11e18bb1cc9220a9d75a43e09e85128ad54e SHA512 6d4ab75878d5e603fa615abd4160c92eb8b686a48ad7f6a64bc85d7009adf5188dd83b564eb187c73e542e6af03c5f5bff58f143acf7ac0c383abcfe27c856a4 +EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010 EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18 -MISC metadata.xml 440 BLAKE2B ba4141809aea82e4fdb57c1c216dcef2c12f1edc3c4ee2405552a74a24d8c53cc22febc8994fe824c41a17f88c7f22dcd383b6a9f59c9f51b81fd83b0f30f4f3 SHA512 8c0066aad63765a2fc18d80de9028aba7e303619fea5efa41a8db1138b3b87434c84b4cadbb0f2961aef42c9262d3265bcee1786f38184d2daa2f369f99377ce +EBUILD lcov-9999.ebuild 825 BLAKE2B 57bdeb72524382fd715b8e854bc6221f2671cf31045c9832078b6d63dae0eca6e20be38ea48a34ad2eb949768d9fc6fc492074a4e97a9ae5d20bc9a492326e92 SHA512 c5c8a461cb533aea1275ff86a3747238405e730a2b1479a1857ba3227a98ee63e6336a1cb1cdafe58e98842cf36af4632ae1423b02ad8527f4a0990056590bd0 +MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289 diff --git a/dev-util/lcov/files/lcov-1.13-gcc-8.patch b/dev-util/lcov/files/lcov-1.13-gcc-8.patch new file mode 100644 index 000000000000..b67ca411bdaf --- /dev/null +++ b/dev-util/lcov/files/lcov-1.13-gcc-8.patch @@ -0,0 +1,91 @@ +From a5dd9529f9232b8d901a4d6eb9ae54cae179e5b3 Mon Sep 17 00:00:00 2001 +From: Peter Oberparleiter +Date: Wed, 7 Mar 2018 14:18:55 +0100 +Subject: [PATCH] geninfo: Add gcc 8 support + +Fix errors and incorrect data when trying to collect coverage data +for programs compiled with gcc 8. + +Covers the following gcov-related changes in gcc: + +.gcov-file format: + - Line coverage data can appear multiple times for the same line + - Line coverage count can be suffixed by '*' to indicated unexecuted + basic blocks in that line + +.gcno-file format: + - new header field 'support unexecuted blocks flag' + - new function record fields 'column number', 'ending line number', + and 'compiler-generated entity flag' + +Signed-off-by: Peter Oberparleiter +--- + bin/geninfo | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/bin/geninfo b/bin/geninfo +index 8562560..ef6a818 100755 +--- a/bin/geninfo ++++ b/bin/geninfo +@@ -68,6 +68,7 @@ our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; + our $gcov_tool = "gcov"; + our $tool_name = basename($0); + ++our $GCOV_VERSION_8_0_0 = 0x80000; + our $GCOV_VERSION_4_7_0 = 0x40700; + our $GCOV_VERSION_3_4_0 = 0x30400; + our $GCOV_VERSION_3_3_0 = 0x30300; +@@ -1934,6 +1935,9 @@ sub read_gcov_file($) + { + my ($count, $line, $code) = ($1, $2, $3); + ++ # Skip instance-specific counts ++ next if ($line == $last_line); ++ + $last_line = $line; + $last_block = $UNNAMED_BLOCK; + # Check for exclusion markers +@@ -1963,6 +1967,9 @@ sub read_gcov_file($) + } + } + ++ # Strip unexecuted basic block marker ++ $count =~ s/\*$//; ++ + # :: + if ($line eq "0") + { +@@ -3537,6 +3544,10 @@ sub read_gcno_function_record(*$$$$$) + graph_expect("function name"); + $function = read_gcno_string($handle, $big_endian); + return undef if (!defined($function)); ++ if ($version >= $GCOV_VERSION_8_0_0) { ++ graph_skip($handle, 4, "compiler-generated entity flag") ++ or return undef; ++ } + # Read filename + graph_expect("filename"); + $filename = read_gcno_string($handle, $big_endian); +@@ -3544,6 +3555,11 @@ sub read_gcno_function_record(*$$$$$) + # Read first line number + $lineno = read_gcno_value($handle, $big_endian, "initial line number"); + return undef if (!defined($lineno)); ++ # Skip column and ending line number ++ if ($version >= $GCOV_VERSION_8_0_0) { ++ graph_skip($handle, 4, "column number") or return undef; ++ graph_skip($handle, 4, "ending line number") or return undef; ++ } + # Add to list + push(@{$bb->{$function}->{$filename}}, $lineno); + graph_add_order($fileorder, $function, $filename); +@@ -3631,6 +3647,10 @@ sub read_gcno($) + debug(sprintf("found version 0x%08x\n", $version)); + # Skip stamp + graph_skip(*HANDLE, 4, "file timestamp") or goto incomplete; ++ if ($version >= $GCOV_VERSION_8_0_0) { ++ graph_skip(*HANDLE, 4, "support unexecuted blocks flag") ++ or goto incomplete; ++ } + while (!eof(HANDLE)) { + my $next_pos; + my $curr_pos; diff --git a/dev-util/lcov/lcov-1.13-r1.ebuild b/dev-util/lcov/lcov-1.13-r1.ebuild deleted file mode 100644 index ee07971279d3..000000000000 --- a/dev-util/lcov/lcov-1.13-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit prefix - -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos" - -RDEPEND=" - dev-lang/perl - dev-perl/GD[png]" - -src_prepare() { - default - if use prefix; then - hprefixify bin/*.{pl,sh} - fi -} - -src_compile() { :; } - -src_install() { - emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install -} diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild new file mode 100644 index 000000000000..4d6f4df43817 --- /dev/null +++ b/dev-util/lcov/lcov-1.13-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos" +fi + +inherit prefix + +DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov" +HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="png" + +RDEPEND=" + dev-lang/perl + png? ( dev-perl/GD[png] ) +" + +PATCHES=( + "${FILESDIR}/lcov-1.13-gcc-8.patch" +) + +src_prepare() { + default + if use prefix; then + hprefixify bin/*.{pl,sh} + fi +} + +src_compile() { :; } + +src_install() { + emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install +} diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild new file mode 100644 index 000000000000..cd55511f0993 --- /dev/null +++ b/dev-util/lcov/lcov-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos" +fi + +inherit prefix + +DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov" +HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="png" + +RDEPEND=" + dev-lang/perl + png? ( dev-perl/GD[png] ) +" + +src_prepare() { + default + if use prefix; then + hprefixify bin/*.{pl,sh} + fi +} + +src_compile() { :; } + +src_install() { + emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install +} diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml index 3073388aefc6..90c86767b856 100644 --- a/dev-util/lcov/metadata.xml +++ b/dev-util/lcov/metadata.xml @@ -1,6 +1,10 @@ + + jeffrey@icurse.nl + Jeffrey Lin + marbacz@gmail.com Marcin Baczyński -- cgit v1.2.3