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

libserdes: link with libc++ libc++abi; fix darwin build #270605

Merged
merged 1 commit into from Dec 1, 2023
Merged

libserdes: link with libc++ libc++abi; fix darwin build #270605

merged 1 commit into from Dec 1, 2023

Conversation

ghost
Copy link

@ghost ghost commented Nov 28, 2023

when stdenv.cc.libcxx is non null update the libserdes++ libs from libstd++ to libc++ libc++abi. This fixes the link error on darwin. However, on x64 linux using stdenv = llvmPackages_16.libcxxStdenv on linux the build fails unless -std=c++11 or above is used.

testing; built. the only program that depends on libserdes, kcat, links to the libserdes and not libserdes++.

ZHF: #265948
https://hydra.nixos.org/build/241150556

Result of nixpkgs-review run on x86_64-darwin 1

3 packages built:
  • kcat
  • libserdes
  • libserdes.dev

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.

Priorities

Add a 👍 reaction to pull requests you find important.

@ghost ghost added 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign backport release-23.11 labels Nov 28, 2023
@ghost ghost requested a review from liff November 28, 2023 13:30
@liff
Copy link
Contributor

liff commented Nov 28, 2023

Result of nixpkgs-review pr 270605 run on x86_64-linux 1

nixpkgs-review posted no results 🤷🏻, but all of the packages build fine on x86_64-linux.

@ghost
Copy link
Author

ghost commented Nov 28, 2023

Result of nixpkgs-review pr 270605 run on x86_64-linux 1

nixpkgs-review posted no results 🤷🏻, but all of the packages build fine on x86_64-linux.

this is expected as this has no effect for the x64 linux derivation. i neglected to mention darwin in the PR title, fixed.

@ghost ghost changed the title libserdes: link with libc++ libc++abi; fix build libserdes: link with libc++ libc++abi; fix darwin build Nov 28, 2023
@ofborg ofborg bot requested a review from liff November 28, 2023 14:13
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 28, 2023
when stdenv.cc.libcxx is non null update the libserdes++ libs from
libstd++ to libc++ libc++abi. This fixes the link error on darwin.
However, on x64 linux using stdenv = llvmPackages_16.libcxxStdenv
on linux the build fails unless -std=c++11 or above is used.

testing; built. the only program that depends on libserdes, kcat, links
to the libserdes and not libserdes++.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 28, 2023
@ofborg ofborg bot requested a review from liff November 28, 2023 18:14
@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 28, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1267

@emilytrau emilytrau merged commit 7762e14 into NixOS:master Dec 1, 2023
12 checks passed
Copy link
Contributor

github-actions bot commented Dec 1, 2023

Successfully created backport PR for release-23.11:

@ghost
Copy link
Author

ghost commented Dec 1, 2023

thanks!

@ghost ghost deleted the libserdes-c++-abi branch December 1, 2023 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants