diff options
Diffstat (limited to 'source/d/make')
-rw-r--r-- | source/d/make/make-3.82-android-build-fix.diff | 16 | ||||
-rwxr-xr-x | source/d/make/make.SlackBuild | 7 |
2 files changed, 21 insertions, 2 deletions
diff --git a/source/d/make/make-3.82-android-build-fix.diff b/source/d/make/make-3.82-android-build-fix.diff new file mode 100644 index 000000000..8cd3db0d4 --- /dev/null +++ b/source/d/make/make-3.82-android-build-fix.diff @@ -0,0 +1,16 @@ +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index 97cbd99cc..18f701b6a 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=make VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix a problem using make-3.82 to build Android: +zcat $CWD/make-3.82-android-build-fix.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ |