diff options
author | Duncaen <mail@duncano.de> | 2015-10-25 14:37:11 +0100 |
---|---|---|
committer | Duncaen <mail@duncano.de> | 2015-10-25 14:37:11 +0100 |
commit | d49889d24686fff901392b6dd1f9c6a5214e8464 (patch) | |
tree | 3e9e40cad8a5cf976c331e850e6c423f24e0d1ae /configure | |
parent | fix struct stat64 problem for musl libc (diff) | |
download | firejail-d49889d24686fff901392b6dd1f9c6a5214e8464.tar.gz firejail-d49889d24686fff901392b6dd1f9c6a5214e8464.tar.zst firejail-d49889d24686fff901392b6dd1f9c6a5214e8464.zip |
Revert "fix struct stat64 problem for musl libc"
This reverts commit 801164566924c41d18d66bdc9ca8b2305103fb82.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 23 |
1 files changed, 3 insertions, 20 deletions
@@ -628,7 +628,6 @@ HAVE_SECCOMP_H | |||
628 | EGREP | 628 | EGREP |
629 | GREP | 629 | GREP |
630 | CPP | 630 | CPP |
631 | HAVE_MUSL_LIBC | ||
632 | HAVE_FATAL_WARNINGS | 631 | HAVE_FATAL_WARNINGS |
633 | HAVE_BIND | 632 | HAVE_BIND |
634 | HAVE_CHROOT | 633 | HAVE_CHROOT |
@@ -689,7 +688,6 @@ enable_seccomp | |||
689 | enable_chroot | 688 | enable_chroot |
690 | enable_bind | 689 | enable_bind |
691 | enable_fatal_warnings | 690 | enable_fatal_warnings |
692 | enable_musl_libc | ||
693 | ' | 691 | ' |
694 | ac_precious_vars='build_alias | 692 | ac_precious_vars='build_alias |
695 | host_alias | 693 | host_alias |
@@ -1309,11 +1307,10 @@ Optional Features: | |||
1309 | --disable-option-checking ignore unrecognized --enable/--with options | 1307 | --disable-option-checking ignore unrecognized --enable/--with options |
1310 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 1308 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1311 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1309 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1312 | --disable-seccomp disable seccomp | 1310 | --disable-seccomp Disable seccomp |
1313 | --disable-chroot disable chroot | 1311 | --disable-chroot Disable chroot |
1314 | --disable-bind disable bind | 1312 | --disable-bind Disable bind |
1315 | --enable-fatal-warnings -W -Wall -Werror | 1313 | --enable-fatal-warnings -W -Wall -Werror |
1316 | --enable-musl-libc ugly hack to allow compilation with musl libc | ||
1317 | 1314 | ||
1318 | Some influential environment variables: | 1315 | Some influential environment variables: |
1319 | CC C compiler command | 1316 | CC C compiler command |
@@ -3103,19 +3100,6 @@ if test "x$enable_fatal_warnings" = "xyes"; then : | |||
3103 | 3100 | ||
3104 | fi | 3101 | fi |
3105 | 3102 | ||
3106 | HAVE_MUSL_LIBC="" | ||
3107 | # Check whether --enable-musl_libc was given. | ||
3108 | if test "${enable_musl_libc+set}" = set; then : | ||
3109 | enableval=$enable_musl_libc; | ||
3110 | fi | ||
3111 | |||
3112 | if test "x$enable_musl_libc" = "xyes"; then : | ||
3113 | |||
3114 | HAVE_MUSL_LIBC="-DHAVE_MUSL_LIBC" | ||
3115 | |||
3116 | |||
3117 | fi | ||
3118 | |||
3119 | # checking pthread library | 3103 | # checking pthread library |
3120 | 3104 | ||
3121 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 | 3105 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 |
@@ -4752,5 +4736,4 @@ echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" | |||
4752 | echo " chroot: $HAVE_CHROOT" | 4736 | echo " chroot: $HAVE_CHROOT" |
4753 | echo " bind: $HAVE_BIND" | 4737 | echo " bind: $HAVE_BIND" |
4754 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 4738 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
4755 | echo " musl libc: $HAVE_MUSL_LIBC" | ||
4756 | echo | 4739 | echo |