aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-12-19 15:02:18 -0600
committerRob Landley <rob@landley.net>2013-12-19 15:02:18 -0600
commit0201900cadbab691386298f195b1574a301c1b99 (patch)
treef8342527a8532028006ca9ca816027d94532918a
parentdb1009dc5c7606e5abf01d41f82ca18001dc1f52 (diff)
downloadtoybox-0201900cadbab691386298f195b1574a301c1b99.tar.gz
Regression test against Ancient Build Environment (Ubuntu 8.04), fixup bit-rot.
-rw-r--r--lib/portability.h7
-rwxr-xr-xscripts/make.sh4
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/portability.h b/lib/portability.h
index 745f8cd9..5506f2b5 100644
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -42,6 +42,10 @@
#define AT_REMOVEDIR 0x200
#endif
+#ifndef MNT_DETACH
+#define MNT_DETACH 2
+#endif
+
// We don't define GNU_dammit because we're not part of the gnu project, and
// don't want to get any FSF on us. Unfortunately glibc (gnu libc)
// won't give us Linux syscall wrappers without claiming to be part of the
@@ -141,9 +145,10 @@ int clearenv(void);
#define SWAP_LE64(x) (x)
#endif
-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || defined(__ANDROID__) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10)
ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
ssize_t getline(char **lineptr, size_t *n, FILE *stream);
#endif
+// compile time probes for stuff libc didn't provide
#include "generated/portability.h"
diff --git a/scripts/make.sh b/scripts/make.sh
index a685010c..5c86e26d 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -126,7 +126,9 @@ GLOBSTRUCT="$(getglobals)"
echo "generated/help.h"
# Only recreate generated/help.h if python2 is installed. Does not work with 3.
-PYTHON="$(which python2 || which python2.6 || which python2.7)"
+[ -z "$(python --version | grep 'Python 2')" ] &&
+ PYTHON="$(which python2 || which python2.6 || which python2.7)" ||
+ PYTHON=python
if [ ! -z "$(grep 'CONFIG_TOYBOX_HELP=y' $KCONFIG_CONFIG)" ];
then
if [ -z "$PYTHON" ];