From c3fa52250b540c0b859fd3beb80cf147108f0fc6 Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Mon, 18 Jun 2007 16:11:08 +0000 Subject: [PATCH] 1.0.6.49: make asdf-based contribs more friendly to :FORCE T * Do the groveling part of sb-grovel only at contrib build time. If the contrib is later recompiled, reuse the results from that grovel. * Doesn't solve the asdf-binary-locations problems related to groveling, but it looks as if asdf-binary-locations is already automatically adding SBCL_HOME into it's exceptions list. --- contrib/sb-bsd-sockets/sb-bsd-sockets.asd | 2 + contrib/sb-grovel/def-to-lisp.lisp | 86 +++++++++++++++-------------- contrib/sb-posix/sb-posix.asd | 3 +- version.lisp-expr | 2 +- 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd index e58bfe9..666a1c5 100644 --- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd +++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd @@ -16,10 +16,12 @@ #-win32 (sb-grovel:grovel-constants-file "constants" :package :sockint + :do-not-grovel (progn #-sb-compiling-contribs t) :depends-on ("defpackage")) #+win32 (sb-grovel:grovel-constants-file "win32-constants" :package :sockint + :do-not-grovel (progn #-sb-compiling-contribs t) :depends-on ("defpackage" "win32-lib")) #+win32 (:file "win32-sockets" :depends-on ("win32-constants")) diff --git a/contrib/sb-grovel/def-to-lisp.lisp b/contrib/sb-grovel/def-to-lisp.lisp index 201eaf8..f2621da 100644 --- a/contrib/sb-grovel/def-to-lisp.lisp +++ b/contrib/sb-grovel/def-to-lisp.lisp @@ -151,7 +151,10 @@ code: (print-c-source f headers definitions package))))) (defclass grovel-constants-file (asdf:cl-source-file) - ((package :accessor constants-package :initarg :package))) + ((package :accessor constants-package :initarg :package) + (do-not-grovel :accessor do-not-grovel + :initform nil + :initarg :do-not-grovel))) (define-condition c-compile-failed (compile-failed) () (:report (lambda (c s) @@ -183,46 +186,47 @@ code: (terpri) (funcall (intern "C-CONSTANTS-EXTRACT" (find-package "SB-GROVEL")) filename tmp-c-source (constants-package component)) - (let* ((cc (or (sb-ext:posix-getenv "CC") - ;; It might be nice to include a CONTINUE or - ;; USE-VALUE restart here, but ASDF seems to insist - ;; on handling the errors itself. - (error "The CC environment variable has not been set in SB-GROVEL. Since this variable should always be set during the SBCL build process, this might indicate an SBCL with a broken contrib installation."))) - (code (sb-ext:process-exit-code - (sb-ext:run-program - cc - (append - (split-cflags (sb-ext:posix-getenv "EXTRA_CFLAGS")) - #+(and linux largefile) - '("-D_LARGEFILE_SOURCE" - "-D_LARGEFILE64_SOURCE" - "-D_FILE_OFFSET_BITS=64") - #+(and x86-64 darwin) - '("-arch" "x86_64") - (list "-o" - (namestring tmp-a-dot-out) - (namestring tmp-c-source))) - :search t - :input nil - :output *trace-output*)))) - (unless (= code 0) - (case (operation-on-failure op) - (:warn (warn "~@" - op component)) - (:error - (error 'c-compile-failed :operation op :component component))))) - (let ((code (sb-ext:process-exit-code - (sb-ext:run-program (namestring tmp-a-dot-out) - (list (namestring tmp-constants)) - :search nil - :input nil - :output *trace-output*)))) - (unless (= code 0) - (case (operation-on-failure op) - (:warn (warn "~@" - op component)) - (:error - (error 'a-dot-out-failed :operation op :component component))))) + (unless (do-not-grovel component) + (let* ((cc (or (sb-ext:posix-getenv "CC") + ;; It might be nice to include a CONTINUE or + ;; USE-VALUE restart here, but ASDF seems to insist + ;; on handling the errors itself. + (error "The CC environment variable has not been set in SB-GROVEL. Since this variable should always be set during the SBCL build process, this might indicate an SBCL with a broken contrib installation."))) + (code (sb-ext:process-exit-code + (sb-ext:run-program + cc + (append + (split-cflags (sb-ext:posix-getenv "EXTRA_CFLAGS")) + #+(and linux largefile) + '("-D_LARGEFILE_SOURCE" + "-D_LARGEFILE64_SOURCE" + "-D_FILE_OFFSET_BITS=64") + #+(and x86-64 darwin) + '("-arch" "x86_64") + (list "-o" + (namestring tmp-a-dot-out) + (namestring tmp-c-source))) + :search t + :input nil + :output *trace-output*)))) + (unless (= code 0) + (case (operation-on-failure op) + (:warn (warn "~@" + op component)) + (:error + (error 'c-compile-failed :operation op :component component))))) + (let ((code (sb-ext:process-exit-code + (sb-ext:run-program (namestring tmp-a-dot-out) + (list (namestring tmp-constants)) + :search nil + :input nil + :output *trace-output*)))) + (unless (= code 0) + (case (operation-on-failure op) + (:warn (warn "~@" + op component)) + (:error + (error 'a-dot-out-failed :operation op :component component)))))) (multiple-value-bind (output warnings-p failure-p) (compile-file tmp-constants :output-file output-file) (when warnings-p diff --git a/contrib/sb-posix/sb-posix.asd b/contrib/sb-posix/sb-posix.asd index 3fe72a0..ff9619e 100644 --- a/contrib/sb-posix/sb-posix.asd +++ b/contrib/sb-posix/sb-posix.asd @@ -13,6 +13,7 @@ (:file "macros" :depends-on ("designator")) (sb-grovel:grovel-constants-file "constants" + :do-not-grovel (progn #-sb-compiling-contribs t) :package :sb-posix :depends-on ("defpackage")) (:file "interface" :depends-on ("constants" "macros" "designator")))) @@ -35,7 +36,7 @@ collect sym))) (cond ((null failures) - t) + t) ((null (set-difference failures ignored-failures)) (warn "~@