Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev-util/lcov: Add gcc-9 support in 1.14-r1 #12760

Closed
wants to merge 1 commit into from

Conversation

gekola
Copy link
Contributor

@gekola gekola commented Aug 21, 2019

This adds upstream patches needed for gcc-9 support to 1.14 since upstream does not plan on making new releases soon and other distros seem to have included relevant changes in their 1.14 packages (Debian, Fedora).

@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @gekola
Areas affected: ebuilds
Packages affected: dev-util/lcov

dev-util/lcov: @anaveragehuman, marbacz[at]gmail.com, @gentoo/proxy-maint

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Aug 21, 2019
@anaveragehuman
Copy link
Contributor

The patch is too large to ship with the repo; consider packaging a patch release instead.

@juippis
Copy link
Member

juippis commented Aug 22, 2019

I'd prefer the proposed patch release as well, if at all possible.
If not, I can upload the patch manually to mirrors.
(this should have a bug opened to block gcc-9 migration)

@gekola
Copy link
Contributor Author

gekola commented Aug 22, 2019

Updated to use Debian patches (this approach seems to be used for some other ebuilds).

This adds upstream patches (packaged by debian) needed for gcc-9
support to 1.14 since upstream does not plan on making new releases
soon[1] and other distros seem to have included relevant changes in
their 1.14 packages[2][3].

Signed-off-by: Nick Herman <gerkola@gmail.com>
@gekola
Copy link
Contributor Author

gekola commented Nov 4, 2019

Squashed and rebased the commits. Also fixed CI warnings (had to remove keywords not present in dev-perl/PerlIO-gzip).

inherit git-r3
else
SRC_URI="
mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, I dont remember whether this was killed or not.
@mgorny any help here?

else
SRC_URI="
mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, let's wait for @mgorny to reply.

Looks good otherwise.

zmedico pushed a commit to zmedico/gentoo that referenced this pull request Nov 26, 2019
This adds upstream patches (packaged by debian) needed for gcc-9
support to 1.14 since upstream does not plan on making new releases
soon[1] and other distros seem to have included relevant changes in
their 1.14 packages[2][3].

Closes: gentoo#12760
Signed-off-by: Nick Herman <gerkola@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
@zmedico
Copy link
Member

zmedico commented Nov 27, 2019

I was looking into merging this, and then I encountered this unit test failure:

DATE .......: 2019-11-27 00:09:34 +0000
TESTNAME ...: lcov_diff_apply
COMMAND ....: "./diff_test"
OUTPUT .....: 
  Capturing coverage data from .
  Found gcov version: 9.2.0
  Using intermediate gcov format
  Scanning . for .gcda files ...
  Found 1 data files in .
  Processing prog.gcda
  Finished .info-file creation
  Capturing coverage data from .
  Found gcov version: 9.2.0
  Using intermediate gcov format
  Scanning . for .gcda files ...
  Found 1 data files in .
  Processing prog.gcda
  Finished .info-file creation
  Reading tracefile old/prog.info
  Reading diff diff
  Converting /var/tmp/portage/dev-util/lcov-1.14_p2/work/lcov-1.14/test/lcov_diff/old/prog.c
  1 entry converted, 0 entries left unchanged.
  Writing data to patched.info
  Summary coverage rate:
    lines......: 38.5% (5 of 13 lines)
    functions..: 66.7% (2 of 3 functions)
    branches...: 14.3% (1 of 7 branches)
  --- patched_normalized.info   2019-11-27 00:09:34.606941686 +0000
  +++ new_normalized.info       2019-11-27 00:09:34.600941686 +0000
  @@ -6,8 +6,6 @@
   FNDA:0,fn
   FNDA:1,fn2
   FNDA:1,main
  -FNF:3
  -FNH:2
   BRDA:6,0,0,-
   BRDA:6,0,1,-
   BRDA:6,0,2,-
  @@ -15,8 +13,6 @@
   BRDA:6,0,4,-
   BRDA:35,0,0,0
   BRDA:35,0,1,1
  -BRF:7
  -BRH:1
   DA:4,0
   DA:6,0
   DA:7,0
  @@ -30,6 +26,4 @@
   DA:35,1
   DA:36,0
   DA:38,1
  -LF:13
  -LH:5
   end_of_record
  Error: Mismatch in patched coverage data file
EXITCODE ...: 1
MEM ........: 87168kB
RESULT .....: fail

@zmedico
Copy link
Member

zmedico commented Nov 27, 2019

Merged in 089acd4 with broken test disabled like this:

# Broken by https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da
rm -rf test/lcov_diff || die

Thanks!

@gekola gekola deleted the lcov-bump branch November 27, 2019 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
6 participants