From ca9a15c9d4fd24a938a29a9c7ea41d6018deb2d4 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 24 Feb 2003 04:33:00 +0000 Subject: [PATCH] 0.7.12.57 Add :force t to asdf-dependent contrib modules Change install.sh to rename old binary/core files instead of copying them - does not kill running SBCL programs in such a gruseome way Create $SBCL_HOME/site-systems in install.sh ... OK, that's IT, I am DONE for 0.7.13 --- contrib/sb-bsd-sockets/Makefile | 2 +- contrib/sb-bsd-sockets/sb-bsd-sockets.asd | 5 +++-- contrib/sb-rotate-byte/Makefile | 2 +- install.sh | 8 +++++--- version.lisp-expr | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/contrib/sb-bsd-sockets/Makefile b/contrib/sb-bsd-sockets/Makefile index 0cfab33..bacd0ec 100644 --- a/contrib/sb-bsd-sockets/Makefile +++ b/contrib/sb-bsd-sockets/Makefile @@ -4,7 +4,7 @@ export CC all: $(MAKE) -C ../asdf - echo "(asdf:operate 'asdf:load-op :$(SYSTEM))" | \ + echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \ $(SBCL) --eval '(load "../asdf/asdf")' test: all diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd index e2ec108..f785c59 100644 --- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd +++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd @@ -61,8 +61,9 @@ (let ((dso-name (unix-name (car (output-files operation dso))))) (unless (zerop (run-shell-command - #-sunos "gcc -shared -o ~S ~{~S ~}" - #+sunos "gcc -shared -lresolv -lsocket -lnsl -o ~S ~{~S ~}" dso-name + #+sunos "gcc -shared -o ~S ~{~S ~} -lresolv" + #-sunos "gcc -shared -o ~S ~{~S ~} " + dso-name (mapcar #'unix-name (mapcan (lambda (c) (output-files operation c)) diff --git a/contrib/sb-rotate-byte/Makefile b/contrib/sb-rotate-byte/Makefile index e77fc03..a07369b 100644 --- a/contrib/sb-rotate-byte/Makefile +++ b/contrib/sb-rotate-byte/Makefile @@ -9,7 +9,7 @@ SYSTEM=sb-rotate-byte all: $(MAKE) -C ../asdf - echo "(asdf:operate 'asdf:load-op :$(SYSTEM))" | \ + echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \ $(SBCL) --eval '(load "../asdf/asdf")' test: all diff --git a/install.sh b/install.sh index 068f4eb..4f93837 100644 --- a/install.sh +++ b/install.sh @@ -22,12 +22,14 @@ SBCL_HOME=$INSTALL_ROOT/lib/sbcl export SBCL_HOME ensure_dirs $INSTALL_ROOT $INSTALL_ROOT/bin $INSTALL_ROOT/lib \ $INSTALL_ROOT/man $INSTALL_ROOT/man/man1 \ - $SBCL_HOME $SBCL_HOME/systems + $SBCL_HOME $SBCL_HOME/systems $SBCL_HOME/site-systems +# move old versions out of the way. Safer than copying: don't want to +# break any running instances that have these files mapped test -f $INSTALL_ROOT/bin/sbcl && \ - cp $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old + mv $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old test -f $SBCL_HOME/sbcl.core && \ - cp $SBCL_HOME/sbcl.core $SBCL_HOME/sbcl.core.old + mv $SBCL_HOME/sbcl.core $SBCL_HOME/sbcl.core.old cp src/runtime/sbcl $INSTALL_ROOT/bin/ cp output/sbcl.core $SBCL_HOME/sbcl.core diff --git a/version.lisp-expr b/version.lisp-expr index 6131f3d..737e135 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.12.56" +"0.7.12.57" -- 1.7.10.4