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

mariadb-connector-odbc: fix build with clang 16 on Darwin #253532

Merged
merged 1 commit into from
Oct 5, 2023
Merged

mariadb-connector-odbc: fix build with clang 16 on Darwin #253532

merged 1 commit into from
Oct 5, 2023

Conversation

reckenrode
Copy link
Contributor

Description of changes

  • Use libkrb5 on Darwin;
  • Use nixpkgs zlib instead of vendored zlib to fix call to undeclared function close; and
  • Include unistd.h for sleep.

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
mariadb-connector-odbc: fix build with clang 16 on Darwin
7a2e245 
* Use libkrb5 on Darwin;
* Use nixpkgs zlib instead of vendored zlib to fix call to undeclared
  function `close`; and
* Include `unistd.h` for `sleep`.
@reckenrode reckenrode mentioned this pull request Sep 5, 2023
Closed
toonn
toonn reviewed Oct 5, 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

The errors I get before this commit include the functions lseek, read, write and close in addition to sleep. I assume this is expected?

@reckenrode
Copy link
Contributor Author

The errors I get before this commit include the functions lseek, read, write and close in addition to sleep. I assume this is expected?

If they’re from the vendored zlib, they’re expected.

toonn
toonn approved these changes Oct 5, 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

@toonn toonn merged commit dee8f46 into NixOS:master Oct 5, 2023
@reckenrode reckenrode mentioned this pull request Oct 6, 2023
Closed
12 tasks
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

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@reckenrode @toonn