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.

Sign up for GitHub

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

Jump to bottom

expect: fix build with clang 16 #259862

Merged
merged 1 commit into from
Oct 16, 2023
Merged

expect: fix build with clang 16 #259862

merged 1 commit into from
Oct 16, 2023

Conversation

reckenrode
Copy link
Contributor

Description of changes

  • Use patches from upstream issue tracker that fix most compilation issues and the configure script; and
  • Modify exp_win.c and pty_termios.c to build properly on Darwin.

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/)
  • 23.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

@reckenrode reckenrode mentioned this pull request Oct 8, 2023
Closed
@reckenrode reckenrode changed the base branch from master to staging October 8, 2023 23:06
@reckenrode reckenrode requested a review from ulrikstrid as a code owner October 8, 2023 23:06
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: ocaml 6.topic: stdenv Standard environment labels Oct 8, 2023
@reckenrode
Copy link
Contributor Author

Retargeting at staging due to the number of rebuilds on Linux.

@github-actions github-actions bot removed 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: ocaml 6.topic: stdenv Standard environment labels Oct 8, 2023
@ofborg ofborg bot requested a review from SuperSandro2000 October 9, 2023 00:58
@reckenrode
expect: fix build with clang 16
68d0dfd 
* Use patches from upstream issue tracker that fix most compilation
  issues and the configure script; and
* Modify `exp_win.c` and `pty_termios.c` to build properly on Darwin.
@ofborg ofborg bot requested a review from SuperSandro2000 October 10, 2023 14:15
toonn
toonn approved these changes Oct 13, 2023
View reviewed changes
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

LGTM on the Darwin side.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 13, 2023
@toonn toonn merged commit 32b8f2e into NixOS:staging Oct 16, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@toonn toonn toonn approved these changes

@ulrikstrid ulrikstrid Awaiting requested review from ulrikstrid

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@reckenrode @toonn @SuperSandro2000 @delroth