Skip to content

gdb: 11.2 -> 12.1#171216

Merged
trofi merged 2 commits intoNixOS:stagingfrom
trofi:updater-gdb
May 13, 2022
Merged

gdb: 11.2 -> 12.1#171216
trofi merged 2 commits intoNixOS:stagingfrom
trofi:updater-gdb

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 2, 2022 •
edited
Loading

Added trivial updater script.
Refreshed nix-specific patch with path to debug symbols.
Dropped upstreamed patches for gcc-12 support and musl support.

Changes: https://www.sourceware.org/gdb/download/ANNOUNCEMENT

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi trofi requested review from Ericson2314, dtzWill and lsix May 2, 2022 09:10
@ofborg ofborg bot requested review from globin and nbp May 2, 2022 10:05
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 2, 2022
@risicle
Copy link
Contributor

risicle commented May 2, 2022

@ofborg build python3.tests.cpython-gdb

@dtzWill
Copy link
Member

dtzWill commented May 3, 2022

@ofborg build pkgsMusl.gdb

ivan
ivan reviewed May 4, 2022
View reviewed changes
ivan
ivan approved these changes May 4, 2022
View reviewed changes
Copy link
Member

@ivan ivan left a comment

Choose a reason for hiding this comment

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

I applied this to NixOS master, booted into a 22.05-pre x86_64 NixOS, used gdb 12.1 a bit and did not see any issues.

trofi and others added 2 commits May 4, 2022 19:39
@trofi
gdb: 11.2 -> 12.1
e6491be 
Added trivial updater script.
Refreshed nix-specific patch with path to debug symbols.
Dropped upstreamed patches for gcc-12 support and musl support.

Changes: https://www.sourceware.org/gdb/download/ANNOUNCEMENT
@dtzWill @trofi
gdb: fix w/musl, touchup postPatch expr
cd1d65c 
Take advantage of the bump and drop the if/null construct for optionalString.
ivan
ivan approved these changes May 5, 2022
View reviewed changes
Copy link
Member

@ivan ivan left a comment

Choose a reason for hiding this comment

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

I did not find issues after building and testing this again on NixOS master.

@Artturin Artturin added the 12.approvals: 2 This PR was reviewed and approved by two persons. label May 9, 2022
lsix
lsix approved these changes May 12, 2022
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

Sorry for the delay, this LGTM.

Thanks.

@trofi trofi merged commit aeeb487 into NixOS:staging May 13, 2022
@trofi trofi deleted the updater-gdb branch May 13, 2022 00:48
@vcunat
Copy link
Member

vcunat commented May 21, 2022 •
edited
Loading

This broke on i686-linux due to -Wformat issues (likely also on other 32-bit platforms). Log: https://hydra.nixos.org/log/pwc8dmrff3x261s9vdrgblg81rfdgdmg-gdb-12.1.drv

EDIT: I can't see any patch on their ML or git.

@trofi
Copy link
Contributor Author

trofi commented May 21, 2022

Thank you!. Looking.

@trofi trofi mentioned this pull request May 21, 2022
Merged
13 tasks
@trofi
Copy link
Contributor Author

trofi commented May 21, 2022

Proposed possible change: #173844

@trofi
Copy link
Contributor Author

trofi commented May 21, 2022

Proposed patches upstream as https://sourceware.org/pipermail/gdb-patches/2022-May/189288.html

trofi added a commit to trofi/nixpkgs that referenced this pull request May 21, 2022
@trofi
pkgsi686Linux.gdb: fix formatting for 32-bit systems
63d81dd 
A few rare targets don't have clean format strings on 32-bit systems:
NixOS#171216 (comment)

    /build/gdb-12.1/_build/sim/../../sim/cris/sim-if.c:575:28:
      error: format '%lx' expects argument of type 'long unsigned int',
        but argument 4 has type 'bfd_size_type' {aka 'long long unsigned int'} [-Werror=format=]

We pull in patch pending upstream inclusion.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtzWill dtzWill Awaiting requested review from dtzWill

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@nbp nbp Awaiting requested review from nbp

@globin globin Awaiting requested review from globin

2 more reviewers

@ivan ivan ivan approved these changes

@lsix lsix lsix approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@trofi @risicle @dtzWill @vcunat @ivan @lsix @Artturin