File: patch.merge

package info (click to toggle)
axiom 20170501-4
  • links: PTS
  • area: main
  • in suites: bullseye, buster, sid
  • size: 1,048,504 kB
  • sloc: lisp: 3,600; makefile: 505; cpp: 223; ansic: 138; sh: 96
file content (123 lines) | stat: -rw-r--r-- 5,607 bytes parent folder | download | duplicates (5)
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
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
--- ./lsp/Makefile.pamphlet.orig	2010-07-25 15:06:30.000000000 +0000
+++ ./lsp/Makefile.pamphlet	2010-07-25 15:07:52.000000000 +0000
@@ -1321,13 +1321,7 @@
 
 gcldir: 
 	@echo 2 building ${GCLVERSION}
-	@tar -zxf ${ZIPS}/${GCLVERSION}.tgz
-<<gcl-2.6.8pre4.socket.patch>>
-<<gcl-2.6.8pre4.libspad.patch>>
-<<gcl-2.6.8pre4.toploop.patch>>
-<<gcl-2.6.8pre4.collectfn.fix>>
-<<gcl-2.6.8pre4.read.patch>>
-<<gclConfigureMake>>
+	echo '(compiler::link (list (compile-file "${BOOKS}/tangle.lisp")) "${OUT}/lisp" (format nil "(progn (let ((*load-path* (cons ~S *load-path*))(si::*load-types* ~S)) (compiler::emit-fn t))(when (fboundp (quote si::sgc-on)) (si::sgc-on t))#-native-reloc(setq compiler::*default-system-p* t))" si::*system-directory* (quote (list #+native-reloc".o" ".lsp"))) "${OBJ}/${SYS}/lib/cfuns-c.o ${OBJ}/${SYS}/lib/sockio-c.o ${OBJ}/${SYS}/lib/libspad.a")' | gcl
 	@echo 13 finished system build on `date` | tee >gcldir
 
 ccldir: ${LSP}/ccl/Makefile
--- ./src/interp/Makefile.pamphlet.orig	2010-06-17 17:23:58.000000000 +0000
+++ ./src/interp/Makefile.pamphlet	2010-06-17 17:26:39.000000000 +0000
@@ -411,15 +411,40 @@
 
 \subsection{save depsys image}
 Once the appropriate commands are in the [[${OUT}/makedep.lisp]] file
-we can load the file into a fresh image and save it. At least that's
+we can load the file into a fresh image and save it. At least that is
 how it used to work. In freebsd we cannot do this so we have to use
 a much more complicated procedure.
 This code used to read:
 \begin{verbatim}
 <<save depsys image>>=
 	@ (cd ${MNT}/${SYS}/bin ; \
-	   echo '(progn (load "${OUT}/makedep.lisp")' \
-                '(spad-save "${DEPSYS}"))' | ${LISPSYS})
+	   echo '#+native-reloc(progn\
+		    (load "${OUT}/makedep.lisp")\
+		    (spad-save "${DEPSYS}"))\
+		 #-native-reloc(progn\
+		    (setq si::*collect-binary-modules* t)\
+		    (load "${OUT}/makedep.lisp")\
+		    (compiler::link\
+			(remove-duplicates si::*binary-modules* :test (quote equal))\
+			"$(DEPSYS)"\
+			(format nil "\
+				(setq si::*collect-binary-modules* t)\
+				(let ((si::*load-path* (cons ~S si::*load-path*))\
+	                              (si::*load-types* ~S))\
+				  (compiler::emit-fn t))\
+				  (load \"$(OUT)/makedep.lisp\")\
+				  (gbc t)\
+				  (when si::*binary-modules*\
+					(error (apply (quote concatenate) (quote string)\
+					 \"Binary module load error: \" si::*binary-modules*)))\
+				  (setq si::collect-binary-modules* nil si::*binary-modules* nil)\
+				  (gbc t)\
+				  ;(fmakunbound (quote si::sgc-on))\
+				  (when (fboundp (quote si::sgc-on)) (si::sgc-on t))\
+				  (setq compiler::*default-system-p* t)"\
+				si::*system-directory* (quote (list ".lsp")))\
+				""\
+				nil))' | sed 's,\\$$,,g' | ${LISPSYS})
 @
 \end{verbatim}
 
@@ -688,7 +713,7 @@
 #	@ cp -p ${SRC}/doc/msgs/co-eng.msgs ${SPAD}/doc/msgs
 	@ echo '${PROCLAIMS}' > ${OUT}/makeint.lisp
 	@ echo '(load "${OUT}/nocompil")' >> ${OUT}/makeint.lisp
-	@ echo '(load "${OUT}/bookvol5")' >> ${OUT}/makeint.lisp
+	@ echo '(load "${OUT}/bookvol5.lsp")' >> ${OUT}/makeint.lisp
 	@ echo '(load "${OUT}/util")' >> ${OUT}/makeint.lisp
 	@ echo '(in-package "BOOT")' >> ${OUT}/makeint.lisp
 	@ touch ${TIMESTAMP}
@@ -716,11 +741,34 @@
 	@ echo '#+:akcl (setq compiler::*suppress-compiler-notes* t)' \
                 >> ${OUT}/makeint.lisp
 	@ echo '#+:akcl (si::gbc-time 0)' >> ${OUT}/makeint.lisp
-	@ echo '#+:akcl (setq si::*system-directory* "${SPAD}/bin/")' \
-               >> ${OUT}/makeint.lisp
-	@ (cd ${OBJ}/${SYS}/bin ; \
-	  echo '(progn (gbc t) (load "${OUT}/makeint.lisp")' \
-                 '(gbc t) (user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
+	@ (cd ${OBJ}/${SYS}/bin ;\
+	   echo '#+native-reloc(progn \
+		      (load "${OUT}/makeint.lisp")\
+		      (gbc t)\
+		      (user::spad-save "${SAVESYS}"))\
+	        #-native-reloc(progn\
+		      (setq si::*collect-binary-modules* t)\
+		      (load "${OUT}/makeint.lisp")\
+		      (compiler::link\
+			(remove-duplicates si::*binary-modules* :test (quote equal))\
+			"$(SAVESYS)"\
+			(format nil "\
+				(let ((si::*load-path* (cons ~S si::*load-path*))\
+                                      (si::*load-types* ~S))\
+				 (compiler::emit-fn t))\
+				 (setq si::*collect-binary-modules* t)\
+				 (load \"$(OUT)/makeint.lisp\")\
+				 (when si::*binary-modules*\
+					(error (apply (quote concatenate) (quote string)\
+					 \"Binary module load error: \" si::*binary-modules*)))\
+				 (setq si::collect-binary-modules* nil si::*binary-modules* nil)\
+				 (gbc t)\
+				 ;(fmakunbound (quote si::sgc-on))\
+				 (when (fboundp (quote si::sgc-on)) (si::sgc-on t))\
+				 (setq compiler::*default-system-p* t boot::|$$SpadServer| nil boot::$$openServerIfTrue t)"\
+			        si::*system-directory* (quote (list ".lsp")))\
+		        "$(OBJ)/$(SYS)/lib/sockio-c.o $(OBJ)/$(SYS)/lib/cfuns-c.o $(OBJ)/$(SYS)/lib/libspad.a"\
+		        nil))' | sed 's,\\$$,,g' | $(LISPSYS))
 	@ echo 6 ${SAVESYS} created
 	@ cp ${SAVESYS} ${AXIOMSYS}
 	@ echo 6a ${AXIOMSYS} created
--- ./src/etc/Makefile.pamphlet.orig	2010-06-17 17:23:58.000000000 +0000
+++ ./src/etc/Makefile.pamphlet	2010-06-17 17:26:39.000000000 +0000
@@ -24,7 +24,7 @@
 	@ cp ${SRC}/doc/topics.data ${INT}/algebra
 	@ cp ${SRC}/doc/topics.data ${INT}/algebra
 	@ (cd ${INT}/algebra ; \
-           echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
+           echo ')lisp #+native-reloc(make-databases "" nil) #-native-reloc(system "cp -pr ${SRC}/../debian/*.daase ${INT}/algebra/")' | ${INTERPSYS} )
 	@ cp -pr ${INT}/algebra/*.daase ${MNT}/${SYS}/algebra
 
 @