1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106
|
Description: Debian branding and naming the executable cmucl instead of lisp
Author: Peter Van Eynde <pvaneynd@debian.org>
Forwarded: not-needed
Index: b/src/tools/build-world.sh
===================================================================
--- a/src/tools/build-world.sh 2011-12-06 09:05:31.531799980 +0000
+++ b/src/tools/build-world.sh 2011-12-06 09:05:40.028045836 +0000
@@ -13,7 +13,7 @@
fi
TARGET="`echo $1 | sed 's:/*$::'`"
-LISP="${2:-lisp}"
+LISP="${2:-cmucl}"
if [ $# -ge 2 ]
then
shift 2
Index: b/src/tools/clmcom.lisp
===================================================================
--- a/src/tools/clmcom.lisp 2011-12-06 09:05:31.531799980 +0000
+++ b/src/tools/clmcom.lisp 2011-12-06 09:05:40.036049835 +0000
@@ -22,11 +22,10 @@
#-pcl(load "target:pcl/pclload")
#-clx
(progn
- (load "target:clx/clx-library")
+ (require :cmucl-clx)
#+gencgc (gc :full t)
#-gencgc (ext:purify))
-(pushnew :motif *features*)
;;; Set this pesky bit ON - see note in clxcom.lisp
(when (boundp 'conditions::*make-condition-accessor-methods*)
@@ -73,6 +72,7 @@
(let ((pn (or (try (c:backend-fasl-file-type c:*backend*))
(try (c:backend-byte-fasl-file-type c:*backend*)))))
(when pn (load pn)))))
+(pushnew :motif *features*)
(with-compiler-log-file
("target:compile-motif.log")
Index: b/src/lisp/lisp.c
===================================================================
--- a/src/lisp/lisp.c 2011-12-06 09:05:31.531799980 +0000
+++ b/src/lisp/lisp.c 2011-12-06 09:05:40.036049835 +0000
@@ -91,8 +91,8 @@
"./.",
"./../lib/cmucl/lib",
"./../lib",
- "/usr/local/lib/cmucl/lib",
"/usr/lib/cmucl",
+ "/usr/local/lib/cmucl/lib",
NULL
};
Index: b/src/clx/clx.lisp
===================================================================
--- a/src/clx/clx.lisp 2011-12-06 09:05:31.531799980 +0000
+++ b/src/clx/clx.lisp 2011-12-06 09:05:40.040051835 +0000
@@ -85,6 +85,7 @@
(pushnew :clx *features*)
(pushnew :xlib *features*)
+(setf *features* (remove :no-clx *features*))
(defparameter *version* "Telent CLX 0.7.3 + CMUCL mods, based on MIT R5.02")
(pushnew :clx-mit-r4 *features*)
Index: b/src/hemlock/main.lisp
===================================================================
--- a/src/hemlock/main.lisp 2011-12-06 09:05:31.531799980 +0000
+++ b/src/hemlock/main.lisp 2011-12-06 09:05:40.048055836 +0000
@@ -31,6 +31,8 @@
(defvar *hemlock-version* "3.5")
(pushnew :hemlock *features*)
+(setf *features* (remove :no-hemlock *features*))
+
(setf (getf ext:*herald-items* :hemlock)
`(" Hemlock " ,*hemlock-version*))
Index: b/src/interface/initial.lisp
===================================================================
--- a/src/interface/initial.lisp 2011-12-06 09:05:31.531799980 +0000
+++ b/src/interface/initial.lisp 2011-12-06 09:05:40.052057835 +0000
@@ -12,6 +12,7 @@
(in-package "CL-USER")
(pushnew :motif *features*)
+(setf *features* (remove :no-clm *features*))
(setf (getf ext:*herald-items* :motif)
`(" Motif toolkit and graphical debugger 1.0"))
Index: b/src/code/save.lisp
===================================================================
--- a/src/code/save.lisp 2011-12-06 09:05:31.531799980 +0000
+++ b/src/code/save.lisp 2011-12-06 09:05:40.052057835 +0000
@@ -117,7 +117,7 @@
(or
#+:executable
*old-cmucl-library-search-list*
- '("/usr/local/lib/cmucl/lib/"))))
+ '("/usr/lib/cmucl/lib/"))))
(setf (search-list "modules:")
'("library:contrib/" "library:subsystems/" "target:contrib/"))
(setf (search-list "ld-library-path:")
|