sysklogd: fix building against musl #109894
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taking guidance from alpine linux's patch[1], removed a few ifdefs and fixed up some includes. [1]: https://git.alpinelinux.org/aports/tree/main/sysklogd/fix-includes.patch
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
symphorien
reviewed
Jan 20, 2021
| @@ -0,0 +1,118 @@ | |||
| diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c | |||
There was a problem hiding this comment.
please describe that the patch is required for musl build only.
Otherwise, someone could try to build without it (on glibc) and remove it on next update, thinking it is not required anymore.
There was a problem hiding this comment.
added a comment at the top of the patch file as well as changed its name, PTAL
yeah breaking things for musl seems like it might be unavoidable without some kind of testing, but don't know nix enough yet to have any suggestions (other than tracking some packages in my own hydra)
|
updated, PTAL |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
taking guidance from alpine linux's patch, removed a few ifdefs and
fixed up some includes.
Fixes #109892.
Motivation for this change
currently, sysklogd won't build with musl-libc, due to some directives narrowly targeting glibc. with this patch, it builds and runs.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)