diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-27 14:25:43 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-27 14:29:48 +0200 |
| commit | 371bf3954680bac23a32ead2194c579bdc78f537 (patch) | |
| tree | 43cbf8ee9a6236db926d2da91040d5ee67ddeaf4 /utils/screen/patches/200-musl-compat.patch | |
| parent | 572fd1e40b8901279fb1357a837109ee9869c727 (diff) | |
screen: fix autoconf misdetection
The configure script shipped by screen uses the presence of `elf.h` and `-lelf`
as indicator for an SVR4 system which implies a `#define BUGGYGETLOGIN`.
The SVR4 `getlogin()` replacement function does not compile with a musl
toolchain and we do not want it anyway, so patch configure to remove the broken
SVR4 detection logic.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'utils/screen/patches/200-musl-compat.patch')
| -rw-r--r-- | utils/screen/patches/200-musl-compat.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/utils/screen/patches/200-musl-compat.patch b/utils/screen/patches/200-musl-compat.patch index 2586bb984..5bbc9d0ea 100644 --- a/utils/screen/patches/200-musl-compat.patch +++ b/utils/screen/patches/200-musl-compat.patch @@ -1,3 +1,50 @@ +--- a/configure ++++ b/configure +@@ -4154,44 +4154,6 @@ fi + rm -f conftest* + + +-oldlibs="$LIBS" +-LIBS="$LIBS -lelf" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SVR4..." >&5 +-$as_echo "$as_me: checking SVR4..." >&6;} +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <utmpx.h> +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_fn_c_check_header_mongrel "$LINENO" "dwarf.h" "ac_cv_header_dwarf_h" "$ac_includes_default" +-if test "x$ac_cv_header_dwarf_h" = xyes; then : +- $as_echo "#define SVR4 1" >>confdefs.h +- $as_echo "#define BUGGYGETLOGIN 1" >>confdefs.h +- +-else +- ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" +-if test "x$ac_cv_header_elf_h" = xyes; then : +- $as_echo "#define SVR4 1" >>confdefs.h +- $as_echo "#define BUGGYGETLOGIN 1" >>confdefs.h +- +-fi +- +- +-fi +- +- +- +-else +- LIBS="$oldlibs" +-fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + for ac_header in stropts.h string.h strings.h --- a/utmp.c +++ b/utmp.c @@ -33,6 +33,7 @@ |