From 64e9a9cae25f4207bec1ec985a46166be2f6fb55 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Tue, 30 May 2006 11:58:43 +0000 Subject: [PATCH] 0.9.13.9: expand portability fixes * $DEVNULL, as BSD expand hangs without < /dev/null, and Windows needs NUL. --- make.sh | 6 ++++-- tools-for-build/canonicalize-whitespace | 2 +- version.lisp-expr | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index 3de7b11..51a36cc 100755 --- 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 --- 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 --- 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" -- 1.7.10.4