nsexec: fix build against musl libc#762
Merged
crosbymichael merged 1 commit intoopencontainers:masterfrom Apr 19, 2016
Merged
Conversation
Remove a wrongly added include which was added in commit 3c2e77e (Add a compatibility header for CentOS/RHEL 6, 2016-01-29) apparently to fix this compile error on centos 6: > In file included from > Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c:20: > /usr/include/linux/netlink.h:35: error: expected specifier-qualifier-list before 'sa_family_t' The glibc bits/sockaddr.h says that this header should never be included directly[1]. Instead, sys/socket.h should be used. The problem was correctly fixed later, in commit 394fb55 (Fix build error on centos6, 2016-03-02) so the incorrect bits/sockaddr.h can safely be removed. This is needed to build musl libc. Fixes opencontainers#761 [1]: https://github.molgen.mpg.de/git-mirror/glibc/blob/20003c49884422da7ffbc459cdeee768a6fee07b/bits/sockaddr.h#L20 Signed-off-by: Natanael Copa <natanael.copa@docker.com>
Member
|
LGTM. |
Member
|
LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Remove a wrongly added include which was added in commit 3c2e77e (Add a
compatibility header for CentOS/RHEL 6, 2016-01-29) apparently to
fix this compile error on centos 6:
The glibc bits/sockaddr.h says that this header should never be included
directly1. Instead, sys/socket.h should be used.
The problem was correctly fixed later, in commit 394fb55 (Fix build
error on centos6, 2016-03-02) so the incorrect bits/sockaddr.h can
safely be removed.
This is needed to build musl libc.
Fixes #761
Signed-off-by: Natanael Copa natanael.copa@docker.com