Skip to content

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

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

Merged
Ericson2314 merged 2 commits into from
May 26, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6ce3b4
libxml2: Test for pthread_create instead of pthread_join on FreeBSD
rhelmot May 24, 2024
75829ee
libxml2: FreeBSD is no longer an impure platform
rhelmot May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pkgs/development/libraries/libxml2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
, zlib
, pkg-config
, autoreconfHook
, xz
, libintl
, python
, gettext
Expand Down Expand Up @@ -37,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: rec {
hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y=";
};

# https://gitlab.gnome.org/GNOME/libxml2/-/issues/725
postPatch = if stdenv.hostPlatform.isFreeBSD then ''
substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create
'' else null;

strictDeps = true;

nativeBuildInputs = [
Expand All @@ -52,11 +56,6 @@ stdenv.mkDerivation (finalAttrs: rec {
ncurses
] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [
libintl
] ++ lib.optionals stdenv.isFreeBSD [
# Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users.
xz
];

propagatedBuildInputs = [
Expand Down