Skip to content

libxml2: Test for pthread_create instead of pthread_join on FreeBSD#314675

Merged
Ericson2314 merged 2 commits intoNixOS:masterfrom
rhelmot:freebsd-minimal3/libxml2
May 26, 2024
Merged

libxml2: Test for pthread_create instead of pthread_join on FreeBSD#314675
Ericson2314 merged 2 commits intoNixOS:masterfrom
rhelmot:freebsd-minimal3/libxml2

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented May 25, 2024

Description of changes

part of #296581

As per the linked upstream issue, ./configure on FreeBSD is busted. Work around it. The configuration is done with if ... then ... else null instead of optionalString in order to be able to apply this diff to master without mass rebuilds.

I also fixed a different issue in the same file. The code referenced FreeBSD's status as an impure platform, but that's not the case anymore. The build works just fine when removed.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 25, 2024
@Ericson2314 Ericson2314 merged commit 2c620de into NixOS:master May 26, 2024
@Ericson2314 Ericson2314 deleted the freebsd-minimal3/libxml2 branch May 26, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants