diff options
| author | Kylie McClain | 2016-02-01 01:36:05 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-02-01 01:36:05 +0100 |
| commit | 40eea690c7eabbf4d12e1e0c30c31f40125ca996 (patch) | |
| tree | 70f409a39ca66325026c908daaf226fd5c44e22f /shell | |
| parent | 4a79224cfcde1c941f581d0c61edaf293e743af5 (diff) | |
| download | busybox-40eea690c7eabbf4d12e1e0c30c31f40125ca996.zip busybox-40eea690c7eabbf4d12e1e0c30c31f40125ca996.tar.gz | |
Fix compiling with musl's utmp stubs
This patch fixes compiling busybox with FEATURE_UTMP and _WTMP enabled.
musl, while not really support utmp/wtmp, provides stub functions, as well
as variables such as _PATH_UTMP, so that programs using utmp or wtmp can
still compile fine.
My reasoning for this patch is that on Exherbo, I'm currently trying to get
us to be able to use the same busybox config file for both glibc and musl
systems, using utmp/wtmp on systems that support it, and using the stubs
on musl without needing two different configs.
As of latest musl git, it provides all utmp functions needed; 1.1.12 doesn't,
but I sent a patch to Rich to add the utmp{,x}name functions expected to
exist, which was merged into musl upstream.
Signed-off-by: Kylie McClain <somasissounds@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index daec975..b5a2d96 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -37,7 +37,6 @@ #define JOBS ENABLE_ASH_JOB_CONTROL -#include <paths.h> #include <setjmp.h> #include <fnmatch.h> #include <sys/times.h> |