0.9.13.9: expand portability fixes

 * $DEVNULL, as BSD expand hangs without < /dev/null, and Windows needs
   NUL.

diff --git a/make.sh b/make.sh
index 3de7b11..51a36cc 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -61,10 +61,12 @@ build_started=`date`
 echo "//starting build: $build_started"
 
 if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then
-    SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit NUL --sysinit NUL}"
+    DEVNULL=NUL
 else
-    SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit /dev/null --sysinit /dev/null}"
+    DEVNULL=/dev/null
 fi
+SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit $DEVNULL --sysinit $DEVNULL}"
+export DEVNULL
 export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 

diff --git a/tools-for-build/canonicalize-whitespace b/tools-for-build/canonicalize-whitespace
index c487a22..11b374d 100755 (executable)
--- a/tools-for-build/canonicalize-whitespace
+++ b/tools-for-build/canonicalize-whitespace
@@ -5,7 +5,7 @@
 # Convert tabs to spaces and delete trailing whitespace in files
 # which we can safely assume to be source files in appropriate languages.
 
-if ! expand --version
+if ! expand --version < $DEVNULL
 then
     # If we're building with MSYS on Windows GNU expand is not available,
     # and what we get is Microsoft Expand, which is something quite different,

diff --git a/version.lisp-expr b/version.lisp-expr
index 12a5ae5..4155dbe 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.13.8"
+"0.9.13.9"