1.0.37.46: SB-POSIX build fix when :SB-DOC is not in features

 * Even those who don't like documentation like working contribs:
   current SB-GROVEL design doesn't really work with #+sb-doc "doc"
   approach.

 Fixes launchpad bug #552564.

diff --git a/NEWS b/NEWS
index 0ec6cd6..f287917 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,8 @@ changes relative to sbcl-1.0.37:
     END is reached. (thanks to Alec Berryman, lp#554385)
   * bug fix: errors signalled during package graph modification no longer
     block FIND-SYMBOL and FIND-PACKAGE in other threads. (lp#511072)
+  * bug fix: SB-POSIX build was broken when SBCL was compiled without the
+    :SB-DOC feature. (lp#552564)
 
 changes in sbcl-1.0.37 relative to sbcl-1.0.36:
   * enhancement: Backtrace from THROW to uncaught tag on x86oids now shows

diff --git a/contrib/sb-posix/constants.lisp b/contrib/sb-posix/constants.lisp
index bffd3f8..2d3c90a 100644 (file)
--- a/contrib/sb-posix/constants.lisp
+++ b/contrib/sb-posix/constants.lisp
@@ -43,46 +43,46 @@
  (:type dev-t "dev_t")
 
  ;; signals
- (:integer SIGHUP "SIGHUP" #+sb-doc "terminal line hangup." t)
- (:integer SIGINT "SIGINT" #+sb-doc "interrupt program." t)
- (:integer SIGQUIT "SIGQUIT" #+sb-doc "quit program." t)
- (:integer SIGILL "SIGILL" #+sb-doc "illegal instruction." t)
- (:integer SIGTRAP "SIGTRAP" #+sb-doc "trace trap." t)
- (:integer SIGABRT "SIGABRT" #+sb-doc "abort program (formerly SIGIOT)." t)
- (:integer SIGEMT "SIGEMT" #+sb-doc "emulate instruction executed." t)
- (:integer SIGFPE "SIGFPE" #+sb-doc "floating-point exception." t)
- (:integer SIGKILL "SIGKILL" #+sb-doc "kill program." t)
- (:integer SIGBUS "SIGBUS" #+sb-doc "bus error." t)
- (:integer SIGSEGV "SIGSEGV" #+sb-doc "segmentation violation." t)
- (:integer SIGSYS "SIGSYS" #+sb-doc "non-existent system call invoked." t)
- (:integer SIGPIPE "SIGPIPE" #+sb-doc "write on a pipe with no reader." t)
- (:integer SIGALRM "SIGALRM" #+sb-doc "real-time timer expired." t)
- (:integer SIGTERM "SIGTERM" #+sb-doc "software termination signal." t)
- (:integer SIGURG "SIGURG" #+sb-doc "urgent condition present on socket." t)
- (:integer SIGSTOP "SIGSTOP" #+sb-doc "stop (cannot be caught or ignored)." t)
- (:integer SIGTSTP "SIGTSTP" #+sb-doc "stop signal generated from keyboard." t)
- (:integer SIGCONT "SIGCONT" #+sb-doc "continue after stop." t)
- (:integer SIGCHLD "SIGCHLD" #+sb-doc "child status has changed." t)
+ (:integer SIGHUP "SIGHUP" "terminal line hangup." t)
+ (:integer SIGINT "SIGINT" "interrupt program." t)
+ (:integer SIGQUIT "SIGQUIT" "quit program." t)
+ (:integer SIGILL "SIGILL" "illegal instruction." t)
+ (:integer SIGTRAP "SIGTRAP" "trace trap." t)
+ (:integer SIGABRT "SIGABRT" "abort program (formerly SIGIOT)." t)
+ (:integer SIGEMT "SIGEMT" "emulate instruction executed." t)
+ (:integer SIGFPE "SIGFPE" "floating-point exception." t)
+ (:integer SIGKILL "SIGKILL" "kill program." t)
+ (:integer SIGBUS "SIGBUS" "bus error." t)
+ (:integer SIGSEGV "SIGSEGV" "segmentation violation." t)
+ (:integer SIGSYS "SIGSYS" "non-existent system call invoked." t)
+ (:integer SIGPIPE "SIGPIPE" "write on a pipe with no reader." t)
+ (:integer SIGALRM "SIGALRM" "real-time timer expired." t)
+ (:integer SIGTERM "SIGTERM" "software termination signal." t)
+ (:integer SIGURG "SIGURG" "urgent condition present on socket." t)
+ (:integer SIGSTOP "SIGSTOP" "stop (cannot be caught or ignored)." t)
+ (:integer SIGTSTP "SIGTSTP" "stop signal generated from keyboard." t)
+ (:integer SIGCONT "SIGCONT" "continue after stop." t)
+ (:integer SIGCHLD "SIGCHLD" "child status has changed." t)
  (:integer SIGTTIN "SIGTTIN"
-           #+sb-doc "background read attempted from control terminal." t)
+           "background read attempted from control terminal." t)
  (:integer SIGTTOU "SIGTTOU"
-           #+sb-doc "background write attempted to control terminal." t)
+           "background write attempted to control terminal." t)
  (:integer SIGIO "SIGIO"
-           #+sb-doc "I/O is possible on a descriptor (see fcntl(2))." t)
+           "I/O is possible on a descriptor (see fcntl(2))." t)
  (:integer SIGXCPU "SIGXCPU"
-           #+sb-doc "cpu time limit exceeded (see setrlimit(2))." t)
+           "cpu time limit exceeded (see setrlimit(2))." t)
  (:integer SIGXFSZ "SIGXFSZ"
-           #+sb-doc "file size limit exceeded (see setrlimit(2))." t)
+           "file size limit exceeded (see setrlimit(2))." t)
  (:integer SIGVTALRM "SIGVTALRM"
-           #+sb-doc "virtual time alarm (see setitimer(2))." t)
+           "virtual time alarm (see setitimer(2))." t)
  (:integer SIGPROF "SIGPROF"
-           #+sb-doc "profiling timer alarm (see setitimer(2))." t)
- (:integer SIGWINCH "SIGWINCH" #+sb-doc "Window size change." t)
- (:integer SIGPWR "SIGPWR" #+sb-doc "Power failure." t)
- (:integer SIGUSR1 "SIGUSR1" #+sb-doc "User defined signal 1." t)
- (:integer SIGUSR2 "SIGUSR2" #+sb-doc "User defined signal 2." t)
- (:integer SIGRTMIN "SIGRTMIN" #+sb-doc "Smallest real-time signal number." t)
- (:integer SIGRTMAX "SIGRTMAX" #+sb-doc "Largest real-time signal number." t)
+           "profiling timer alarm (see setitimer(2))." t)
+ (:integer SIGWINCH "SIGWINCH" "Window size change." t)
+ (:integer SIGPWR "SIGPWR" "Power failure." t)
+ (:integer SIGUSR1 "SIGUSR1" "User defined signal 1." t)
+ (:integer SIGUSR2 "SIGUSR2" "User defined signal 2." t)
+ (:integer SIGRTMIN "SIGRTMIN" "Smallest real-time signal number." t)
+ (:integer SIGRTMAX "SIGRTMAX" "Largest real-time signal number." t)
 
  ;; error numbers
  (:errno eperm "EPERM" nil t)
@@ -248,23 +248,23 @@
 
  ;; mmap()
  (:type off-t "off_t")
- (:integer prot-none "PROT_NONE" #+sb-doc "mmap: no protection" t)
- (:integer prot-read "PROT_READ" #+sb-doc "mmap: read protection" t)
- (:integer prot-write "PROT_WRITE" #+sb-doc "mmap: write protection" t)
- (:integer prot-exec "PROT_EXEC" #+sb-doc "mmap: execute protection" t)
- (:integer map-shared "MAP_SHARED" #+sb-doc "mmap: shared memory" t)
- (:integer map-private "MAP_PRIVATE" #+sb-doc "mmap: private mapping" t)
- (:integer map-fixed "MAP_FIXED" #+sb-doc "mmap: map at given location" t)
+ (:integer prot-none "PROT_NONE" "mmap: no protection" t)
+ (:integer prot-read "PROT_READ" "mmap: read protection" t)
+ (:integer prot-write "PROT_WRITE" "mmap: write protection" t)
+ (:integer prot-exec "PROT_EXEC" "mmap: execute protection" t)
+ (:integer map-shared "MAP_SHARED" "mmap: shared memory" t)
+ (:integer map-private "MAP_PRIVATE" "mmap: private mapping" t)
+ (:integer map-fixed "MAP_FIXED" "mmap: map at given location" t)
 
  ;; msync()
- (:integer ms-async "MS_ASYNC" #+sb-doc "msync: return immediately" t)
- (:integer ms-sync "MS_SYNC" #+sb-doc "msync: perform synchronous writes" t)
+ (:integer ms-async "MS_ASYNC" "msync: return immediately" t)
+ (:integer ms-sync "MS_SYNC" "msync: perform synchronous writes" t)
  (:integer ms-invalidate "MS_INVALIDATE"
-           #+sb-doc "msync: invalidate all cached data" t)
+           "msync: invalidate all cached data" t)
 
  ;; mlockall()
- (:integer mcl-current "MCL_CURRENT" #+sb-doc "mlockall: lock all pages which are currently mapped into the address space of the process." t)
- (:integer mcl-future "MCL_FUTURE" #+sb-doc "mlockall: lock all pages which will become mapped into the address space of the process in the future." t)
+ (:integer mcl-current "MCL_CURRENT" "mlockall: lock all pages which are currently mapped into the address space of the process." t)
+ (:integer mcl-future "MCL_FUTURE" "mlockall: lock all pages which will become mapped into the address space of the process in the future." t)
 
  ;; opendir()
  (:structure dirent

diff --git a/version.lisp-expr b/version.lisp-expr
index 459e38c..7b98a82 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".)
-"1.0.37.45"
+"1.0.37.46"