From 762cc09a6fc92af20c0581cfc97d1630fa642ddb Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Thu, 2 Nov 2006 12:55:51 +0000 Subject: [PATCH] 0.9.18.24: Fix SB-EXECUTABLE on win32. (Patch by Marko Kocic, sbcl-devel "sb-executable mingw patch" on 2006-08-29). * Yes, SB-EXECUTABLE is mostly useless, since nobody uses it for making "executables". But there are libraries that load SB-EXECUTABLE for the unfortunately exported COPY-STREAM function. * Oops, whitespace damage from 0.9.18.23. --- contrib/sb-executable/sb-executable.lisp | 5 +++-- contrib/sb-posix/interface.lisp | 2 +- version.lisp-expr | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/sb-executable/sb-executable.lisp b/contrib/sb-executable/sb-executable.lisp index a2be573..c37bd89 100644 --- a/contrib/sb-executable/sb-executable.lisp +++ b/contrib/sb-executable/sb-executable.lisp @@ -37,8 +37,8 @@ exec sbcl --noinform ~{~A ~}--eval \"(with-open-file (i \\\"$0\\\" :element-type (defun make-executable (output-file fasls &key (runtime-flags '("--disable-debugger" - "--userinit /dev/null" - "--sysinit /dev/null")) + "--no-userinit" + "--no-sysinit")) initial-function) "Write an executable called OUTPUT-FILE which can be run from the shell, by 'linking' together code from FASLS. Actually works by concatenating them and prepending a #! header" (with-open-file (out output-file @@ -56,6 +56,7 @@ exec sbcl --noinform ~{~A ~}--eval \"(with-open-file (i \\\"$0\\\" :element-type (let* (;; FIXME: use OUT as the pathname designator (out-name (namestring (translate-logical-pathname output-file))) (prot (elt (multiple-value-list (sb-unix:unix-stat out-name)) 3))) + #-win32 (if prot (sb-unix::void-syscall ("chmod" c-string int) out-name diff --git a/contrib/sb-posix/interface.lisp b/contrib/sb-posix/interface.lisp index 427efb1..f5cb4fb 100644 --- a/contrib/sb-posix/interface.lisp +++ b/contrib/sb-posix/interface.lisp @@ -315,7 +315,7 @@ ;; Note: _stat, _lstat, and _fstat for NetBSD are provided in ;; src/runtime/bsd-os.c. See comments in that file ;; for an explanation. -- RMK 2006-10-15 -(define-stat-call #-(or win32 netbsd) "stat" #+(or win32 netbsd) "_stat" +(define-stat-call #-(or win32 netbsd) "stat" #+(or win32 netbsd) "_stat" pathname filename (function int c-string (* alien-stat))) diff --git a/version.lisp-expr b/version.lisp-expr index 60600a0..8680cdb 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.18.23" +"0.9.18.24" -- 1.7.10.4