[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs
From: |
Mark Murray |
Subject: |
Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error) |
Date: |
Sun, 27 Jun 2004 20:36:40 +0100 |
root writes:
> Mark,
Hi!
> If you have patches to anything that are required to run Axiom I'd
> be happy to incorporate them into Axiom's build. Please run
>
> diff -Naur original-file changed-file >changed-file.patch
I'm using CVS, so enclosed is the output from
# cvs -q diff -ud
Which should be the same thing. For FreeBSD, I use the noweb _port_,
so some of my diffs are to kill the building of noweb as part of axiom.
These could be done differently, as they are a bit hackish. Also, I
make sure that zips/ is empty, to make sure I get all the build tools
from the environment. I've added no files locally, only modified some.
I'm sort-of expecting that some of the patches will be treated as
local (to me) preferences to be carried as local diffs.
> and send me the patch files.
Enclosed!
M
--
Mark Murray
iumop ap!sdn w,I idlaH
Index: Makefile
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile,v
retrieving revision 1.9
diff -u -d -r1.9 Makefile
--- Makefile 19 Jun 2004 22:21:25 -0000 1.9
+++ Makefile 27 Jun 2004 19:24:08 -0000
@@ -6,7 +6,8 @@
#GCLVERSION=gcl-2.5
#GCLVERSION=gcl-2.5.2
#GCLVERSION=gcl-2.6.1
-GCLVERSION=gcl-2.6.2
+#GCLVERSION=gcl-2.6.2
+GCLVERSION=gcl-system
AWK=gawk
GCLDIR=${LSP}/${GCLVERSION}
SRC=${SPD}/src
@@ -20,7 +21,7 @@
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -68,6 +69,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "FreeBSD" "FreeBSD"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -79,6 +81,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
@@ -95,7 +98,13 @@
@echo 78 installing Axiom in ${INSTALL}
@mkdir -p ${INSTALL}
@cp -pr ${MNT} ${INSTALL}
- @echo AXIOM=${INSTALL}/mnt/${SYS} >${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
+ @echo export AXIOM >>${COMMAND}
+ @echo DAASE='$${AXIOM}' >>${COMMAND}
+ @echo export DAASE >>${COMMAND}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND}
+ @echo export PATH >>${COMMAND}
@cat ${SRC}/etc/axiom >>${COMMAND}
@chmod +x ${COMMAND}
@echo 79 Axiom installation finished.
Index: Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile.pamphlet,v
retrieving revision 1.22
diff -u -d -r1.22 Makefile.pamphlet
--- Makefile.pamphlet 27 Jun 2004 15:00:46 -0000 1.22
+++ Makefile.pamphlet 27 Jun 2004 19:24:12 -0000
@@ -186,7 +186,7 @@
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -268,6 +268,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "FreeBSD" "FreeBSD"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -279,6 +280,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
@@ -402,7 +404,13 @@
@echo 78 installing Axiom in ${INSTALL}
@mkdir -p ${INSTALL}
@cp -pr ${MNT} ${INSTALL}
- @echo AXIOM=${INSTALL}/mnt/${SYS} >${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
+ @echo export AXIOM >>${COMMAND}
+ @echo DAASE='$${AXIOM}' >>${COMMAND}
+ @echo export DAASE >>${COMMAND}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND}
+ @echo export PATH >>${COMMAND}
@cat ${SRC}/etc/axiom >>${COMMAND}
@chmod +x ${COMMAND}
@echo 79 Axiom installation finished.
@@ -410,7 +418,7 @@
@echo Please add $(shell dirname ${COMMAND}) to your PATH variable
@echo Start Axiom with the command $(shell basename ${COMMAND})
@echo
-
+
@
\subsection{document}
@@ -546,6 +554,11 @@
optimizations for function calling in Axiom. This is handled automatically
by changing this variable.
+If GCLVERSION is ``gcl-system'', then no GCL is not built locally,
+and it is assumed that the ``gcl'' command is available off the
+path. If this GCL is unsuitable for building Axiom, then very bad
+things will happen.
+
NOTE WELL: IF YOU CHANGE THIS YOU SHOULD ERASE THE lsp/Makefile FILE.
This will cause the build to remake the lsp/Makefile from the
lsp/Makefile.pamphlet file and get the correct version. If you
@@ -555,7 +568,8 @@
#GCLVERSION=gcl-2.5
#GCLVERSION=gcl-2.5.2
#GCLVERSION=gcl-2.6.1
-GCLVERSION=gcl-2.6.2
+#GCLVERSION=gcl-2.6.2
+GCLVERSION=gcl-system
@
\subsection{Makefile.axposf1v3}
@@ -851,6 +865,51 @@
<<clean>>
@
+\subsection{Makefile.freebsd}
+Annoyingly enough it seems that GCL uses a default extension of .lsp
+rather than .lisp so we add the {\bf LISP} variable here. We need to
+depend on the default extension behavior because the system build
+will load either the interpreted or compiled form of a file depending
+on which is available. This varies at different stages of the build.
+<<Makefile.freebsd>>=
+# System dependent Makefile for the freebsd platform
+# Platform variable
+PLF:=FREEBSDplatform
+# C compiler flags
+CCF:="-O -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/X11R6/include -I/usr/local/include"
+# Loader flags
+LDF:="-L/usr/X11R6/lib -L/usr/local/lib"
+# C compiler to use
+CC:=gcc
+AWK=awk
+RANLIB=ranlib
+TOUCH=touch
+TAR=tar
+AXIOMXLROOT=${AXIOM}/compiler
+O=o
+BYE=bye
+LISP=lsp
+DAASE=${SRC}/share
+
+ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
+ TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
+ LISP=${LISP} DAASE=${DAASE} TANGLE=${TANGLE}
+
+all: rootdirs srcsetup lspdir srcdir
+ @echo 45 Makefile.freebsd called
+ @echo 46 Environment : ${ENV}
+ @echo 47 finished system build on `date` | tee >lastBuildDate
+
+<<rootdirs>>
+<<noweb>>
+<<literate commands>>
+<<srcsetup>>
+<<src>>
+<<lsp>>
+<<document>>
+<<clean>>
+
+@
\subsection{Makefile.linux}
Annoyingly enough it seems that GCL uses a default extension of .lsp
rather than .lisp so we add the {\bf LISP} variable here. We need to
@@ -1332,7 +1391,5 @@
Bath BA2 5QR UK Tel. +44-1225-837430
{\bf http://www.codemist.co.uk}
\bibitem{4} \$SPAD/zips/noweb-2.10a.tgz, the noweb source tree
-\bibitem{5} \$SPAD/zips/advi-1.2.0.tar.gz, the advi source tree
\end{thebibliography}
\end{document}
-
Index: lsp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/lsp/Makefile.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile.pamphlet
--- lsp/Makefile.pamphlet 28 Apr 2004 00:14:08 -0000 1.7
+++ lsp/Makefile.pamphlet 27 Jun 2004 19:24:16 -0000
@@ -650,15 +650,48 @@
echo 20 applying toploop patch to unixport/init_gcl.lsp ; \
patch <${SPD}/zips/${GCLVERSION}.unixport.init_gcl.lsp.patch )
@
+\subsection{GCL already installed}
+<<gcl-system>>=
+# locally installed GCL
+OUT=${OBJ}/${SYS}/bin
+
+all:
+ @echo 21 building ${LSP} ${GCLVERSION}
+
+gcldir:
+ @echo 22 building for ${GCLVERSION}
+ echo "(compiler::link nil \"${OUT}/lisp\" \"(setq
compiler::*default-system-p* t)\" \"${OBJ}/${SYS}/lib/cfuns-c.o
${OBJ}/${SYS}/lib/sockio-c.o ${OBJ}/${SYS}/lib/libspad.a\")" | gcl
+ @echo 23 finished gcl build on `date` | tee >gcldir
+
+ccldir: ${LSP}/ccl/Makefile
+ @echo 24 building CCL
+ @mkdir -p ${INT}/ccl
+ @mkdir -p ${OBJ}/${SYS}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} )
+
+${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
+ @echo 25 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
+ @( cd ccl ; ${SPADBIN}/document ${NOISE} Makefile )
+
+document:
+ @echo 26 making docs in ${LSP}
+ @mkdir -p ${INT}/doc/lsp/ccl
+ @( cd ccl ; ${ENV} ${MAKE} document )
+
+clean:
+ @echo 27 cleaning ${LSP}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} clean )
+@
+\eject
<<*>>=
# gcl version 2.4.1
OUT=${OBJ}/${SYS}/bin
all:
- @echo 14 building ${LSP} ${GCLVERSION}
+ @echo 28 building ${LSP} ${GCLVERSION}
gcldir:
- @echo 15 building ${GCLVERSION}
+ @echo 29 building ${GCLVERSION}
@tar -zxf ${ZIPS}/${GCLVERSION}.tgz
<<gcl-2.4.1.socket.patch>>
<<gcl-2.4.1.fortran.patch>>
@@ -668,25 +701,25 @@
./configure --enable-vssize=65536 ; \
${ENV} ${MAKE} ; \
cp unixport/saved_gcl ${OUT}/lisp )
- @echo 21 finished system build on `date` | tee >gcldir
+ @echo 30 finished system build on `date` | tee >gcldir
ccldir: ${LSP}/ccl/Makefile
- @echo 22 building CCL
+ @echo 31 building CCL
@mkdir -p ${INT}/ccl
@mkdir -p ${OBJ}/${SYS}/ccl
@( cd ccl ; ${ENV} ${MAKE} )
${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
- @echo 23 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
+ @echo 32 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
@( cd ccl ; ${SPADBIN}/document ${NOISE} Makefile )
document:
- @echo 24 making docs in ${LSP}
+ @echo 33 making docs in ${LSP}
@mkdir -p ${INT}/doc/lsp/ccl
@( cd ccl ; ${ENV} ${MAKE} document )
clean:
- @echo 25 cleaning ${LSP}/ccl
+ @echo 34 cleaning ${LSP}/ccl
@( cd ccl ; ${ENV} ${MAKE} clean )
@
\eject
Index: src/booklets/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/booklets/Makefile.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile.pamphlet
--- src/booklets/Makefile.pamphlet 28 Aug 2003 12:15:28 -0000 1.1
+++ src/booklets/Makefile.pamphlet 27 Jun 2004 19:24:21 -0000
@@ -19,6 +19,7 @@
clean:
@echo 2 cleaning ${INT}/docs/src/booklets
@rm -rf ${INT}/docs/src/booklets
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/booklets/Sorting.booklet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/booklets/Sorting.booklet,v
retrieving revision 1.1
diff -u -d -r1.1 Sorting.booklet
--- src/booklets/Sorting.booklet 28 Aug 2003 12:15:28 -0000 1.1
+++ src/booklets/Sorting.booklet 27 Jun 2004 19:24:34 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{/home/axiomgnu/new/mnt/linux/bin/tex/noweb}
+\usepackage{../../src/scripts/tex/noweb}
\begin{document}
\title{Sorting Facilities}
\author{Timothy Daly}
Index: src/boot/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/boot/Makefile.pamphlet,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile.pamphlet
--- src/boot/Makefile.pamphlet 27 Jun 2004 15:00:58 -0000 1.6
+++ src/boot/Makefile.pamphlet 27 Jun 2004 19:24:42 -0000
@@ -1615,6 +1615,7 @@
clean:
@echo 43 cleaning ${OUT}
@rm -f ${OUT}
+ @rm -f Makefile Makefile.dvi
@
\section{The Makefile}
Index: src/clef/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/Makefile.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile.pamphlet
--- src/clef/Makefile.pamphlet 27 Jun 2004 15:00:58 -0000 1.3
+++ src/clef/Makefile.pamphlet 27 Jun 2004 19:24:42 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/clef Makefile}
\author{Timothy Daly}
Index: src/clef/edible.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/edible.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 edible.c.pamphlet
--- src/clef/edible.c.pamphlet 7 Feb 2004 03:24:24 -0000 1.3
+++ src/clef/edible.c.pamphlet 27 Jun 2004 19:24:44 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/clef edible.c}
\author{The Axiom Team}
@@ -159,7 +159,7 @@
perror("ptyopen failed");
exit(-1);
}
-
+
/* call the routine that handles signals */
catch_signals();
Index: src/doc/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/doc/Makefile.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile.pamphlet
--- src/doc/Makefile.pamphlet 27 Jun 2004 15:00:59 -0000 1.7
+++ src/doc/Makefile.pamphlet 27 Jun 2004 19:24:44 -0000
@@ -105,6 +105,7 @@
clean:
@echo 4 cleaning ${SRC}/doc
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/doc/axiom.bib.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/doc/axiom.bib.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 axiom.bib.pamphlet
--- src/doc/axiom.bib.pamphlet 28 Aug 2003 12:28:30 -0000 1.1
+++ src/doc/axiom.bib.pamphlet 27 Jun 2004 19:25:44 -0000
@@ -12231,7 +12231,7 @@
\subsection{Makefile}
<<Makefile>>=
@MISC{Makefile,
- path=./mnt/linux/bin/Makefile.pamphlet
+ path=./mnt/${SYS}/bin/Makefile.pamphlet
}
@
Index: src/etc/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/etc/Makefile.pamphlet,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile.pamphlet
--- src/etc/Makefile.pamphlet 27 Jun 2004 15:00:59 -0000 1.6
+++ src/etc/Makefile.pamphlet 27 Jun 2004 19:25:44 -0000
@@ -91,6 +91,7 @@
@rm -rf ${MID}
@echo 4 cleaning ${DOC}
@rm -rf ${DOC}
+ @rm -f Makefile Makefile.dvi
@
\eject
Index: src/etc/axiom
===================================================================
RCS file: /cvsroot/axiom/axiom/src/etc/axiom,v
retrieving revision 1.3
diff -u -d -r1.3 axiom
--- src/etc/axiom 7 Feb 2004 03:24:24 -0000 1.3
+++ src/etc/axiom 27 Jun 2004 19:25:44 -0000
@@ -1,8 +1,10 @@
-export AXIOM
system=`uname -s`
case "$system" in
+ FreeBSD) clef -e $AXIOM/bin/AXIOMsys "$@"
+ ;;
+
Linux) clef -e $AXIOM/bin/AXIOMsys "$@"
;;
Index: src/include/useproto.h
===================================================================
RCS file: /cvsroot/axiom/axiom/src/include/useproto.h,v
retrieving revision 1.2
diff -u -d -r1.2 useproto.h
--- src/include/useproto.h 9 Oct 2003 10:45:16 -0000 1.2
+++ src/include/useproto.h 27 Jun 2004 19:25:44 -0000
@@ -34,7 +34,7 @@
#ifndef _USEPROTO_H_
#define _USEPROTO_H_ 1
-#if defined(SGIplatform)||defined(LINUXplatform)||defined(HPplatform)
||defined(RIOSplatform) ||defined(RIOS4platform) || defined(SUN4OS5platform)
+#if defined(SGIplatform)||defined(LINUXplatform)||defined(HPplatform)
||defined(RIOSplatform) ||defined(RIOS4platform) ||
defined(SUN4OS5platform)||defined(FREEBSDplatform)
#ifdef _NO_PROTO
#undef _NO_PROTO
#endif
Index: src/input/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/input/Makefile.pamphlet,v
retrieving revision 1.9
diff -u -d -r1.9 Makefile.pamphlet
--- src/input/Makefile.pamphlet 27 Jun 2004 15:01:25 -0000 1.9
+++ src/input/Makefile.pamphlet 27 Jun 2004 19:26:10 -0000
@@ -6841,6 +6841,7 @@
@rm -rf ${MID}
@echo 7 cleaning ${OUT}
@rm -rf ${OUT}
+ @rm -f Makefile Makefile.dvi
<<algaggr>>
<<algbrbf>>
Index: src/interp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/Makefile.pamphlet,v
retrieving revision 1.11
diff -u -d -r1.11 Makefile.pamphlet
--- src/interp/Makefile.pamphlet 27 Jun 2004 15:01:27 -0000 1.11
+++ src/interp/Makefile.pamphlet 27 Jun 2004 19:26:49 -0000
@@ -616,8 +616,10 @@
@ echo '(load "${OUT}/c-util")' >> ${OUT}/makedep.lisp
@ echo '(unless (probe-file "${OUT}/g-util.${O}") (compile-file
"${OUT}/g-util.${LISP}" :output-file "${OUT}/g-util.${O}"))' >>
${OUT}/makedep.lisp
@ echo '(load "${OUT}/g-util")' >> ${OUT}/makedep.lisp
- @ (cd ${MNT}/${SYS}/bin ; \
- echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))'
| ${LISPSYS})
+# @ (cd ${MNT}/${SYS}/bin ; \
+# echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))'
| ${LISPSYS})
+ @ ( cd ${OBJ}/${SYS}/bin && \
+ echo '(setq si::*collect-binary-modules* t)(load
"${OUT}/makedep.lisp")(compiler::link (remove-duplicates si::*binary-modules*
:test (quote equal)) "$(DEPSYS)" "(setq si::*collect-binary-modules* t)(load
\"$(OUT)/makedep.lisp\")(gbc t)(when si::*binary-modules* (error
si::*binary-modules*))(setq si::collect-binary-modules* nil
si::*binary-modules* nil)(gbc t)(setq compiler::*default-system-p* t)" "" nil)'
| ${LISPSYS})
@ echo 4 ${DEPSYS} created
@
@@ -669,8 +671,10 @@
@ 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 '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t)
(user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
+ @ (cd ${OBJ}/${SYS}/bin && \
+ echo '(setq si::*collect-binary-modules* t)(setq x
si::*system-directory*)(load "${OUT}/makeint.lisp")(setq si::*system-directory*
x)(compiler::link (remove-duplicates si::*binary-modules* :test (quote equal))
"$(SAVESYS)" "(setq si::*collect-binary-modules* t)(load
\"$(OUT)/makeint.lisp\")(when si::*binary-modules* (error
si::*binary-modules*)(setq si::collect-binary-modules* nil si::*binary-modules*
nil)(setq compiler::*default-system-p* t)(gbc t))"
"$(OBJ)/$(SYS)/lib/sockio-c.o $(OBJ)/$(SYS)/lib/cfuns-c.o
$(OBJ)/$(SYS)/lib/libspad.a" nil)' | ${LISPSYS})
@ echo 6 ${SAVESYS} created
@ cp ${SAVESYS} ${AXIOMSYS}
@ echo 6a ${AXIOMSYS} created
Index: src/interp/debugsys.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/debugsys.lisp.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 debugsys.lisp.pamphlet
--- src/interp/debugsys.lisp.pamphlet 24 May 2004 22:53:51 -0000 1.2
+++ src/interp/debugsys.lisp.pamphlet 27 Jun 2004 19:26:49 -0000
@@ -79,7 +79,7 @@
(thesymb "/int/interp/buildom.clisp")
(thesymb "/int/interp/cattable.clisp")
(thesymb "/int/interp/cformat.clisp")
- (thesymb "/obj/linux/interp/cfuns.o")
+ (thesymb "/obj/${SYS}/interp/cfuns.o")
(thesymb "/int/interp/clam.clisp")
(thesymb "/int/interp/clammed.clisp")
(thesymb "/int/interp/comp.lisp")
@@ -152,7 +152,7 @@
(thesymb "/int/interp/sfsfun.clisp")
(thesymb "/int/interp/simpbool.clisp")
(thesymb "/int/interp/slam.clisp")
- (thesymb "/obj/linux/interp/sockio.o")
+ (thesymb "/obj/${SYS}/interp/sockio.o")
(thesymb "/int/interp/spad.lisp")
(thesymb "/int/interp/spaderror.lisp")
(thesymb "/int/interp/template.clisp")
@@ -232,13 +232,13 @@
())
(list
(thesymb "/int/interp/ax.clisp"))
- "/mnt/linux"
+ "/mnt/${SYS}"
"/lsp"
"/src"
"/int"
"/obj"
"/mnt"
- "linux")
+ "${SYS}")
(in-package "SCRATCHPAD-COMPILER")
(boot::set-restart-hook)
(in-package "BOOT")
@@ -247,7 +247,7 @@
(load (user::thepath "/int/interp/obey.lsp"))
;(si::multiply-bignum-stack 10)
(si::gbc-time 0)
-(setq si::*system-directory* (user::thepath "/mnt/linux/bin/"))
+(setq si::*system-directory* (user::thepath "/mnt/${SYS}/bin/"))
(gbc t)
@
Index: src/interp/util.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/util.lisp.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 util.lisp.pamphlet
--- src/interp/util.lisp.pamphlet 24 May 2004 22:54:05 -0000 1.5
+++ src/interp/util.lisp.pamphlet 27 Jun 2004 19:27:00 -0000
@@ -813,7 +813,7 @@
This function will do that. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(recompile-all-libs "/spad/mnt/linux/algebra")
+(recompile-all-libs "/spad/mnt/${SYS}/algebra")
\end{verbatim}
<<recompile-all-libs>>=
(defun recompile-all-libs (dir)
@@ -838,11 +838,11 @@
Note that it will build a pathname from the current {\bf AXIOM}
shell variable. So if the {\bf AXIOM} shell variable had the value
\begin{verbatim}
-/spad/mnt/linux
+/spad/mnt/${SYS}
\end{verbatim}
then the wildcard expands to
\begin{verbatim}
-/spad/mnt/linux/nalg/*.spad
+/spad/mnt/${SYS}/nalg/*.spad
\end{verbatim}
and all of the matching files would be recompiled.
<<recompile-all-algebra-files>>=
@@ -879,7 +879,7 @@
before compiling this file. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(reroot "/spad/mnt/linux")
+(reroot "/spad/mnt/${SYS}")
\end{verbatim}
<<reroot>>=
(defun reroot (dir)
Index: src/lib/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/Makefile.pamphlet,v
retrieving revision 1.8
diff -u -d -r1.8 Makefile.pamphlet
--- src/lib/Makefile.pamphlet 27 Jun 2004 15:01:39 -0000 1.8
+++ src/lib/Makefile.pamphlet 27 Jun 2004 19:27:02 -0000
@@ -490,6 +490,7 @@
clean:
@echo 70 cleaning ${IN}
@rm -rf ${MID} ${OUT} ${DOCINT} ${DOCMNT}
+ @rm -f Makefile Makefile.dvi
@
\subsection{Makefile documentation}
Index: src/lib/XDither.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XDither.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 XDither.c.pamphlet
--- src/lib/XDither.c.pamphlet 27 Jun 2004 15:01:41 -0000 1.4
+++ src/lib/XDither.c.pamphlet 27 Jun 2004 19:27:02 -0000
@@ -51,7 +51,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <malloc.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Index: src/lib/XShade.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XShade.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 XShade.c.pamphlet
--- src/lib/XShade.c.pamphlet 27 Jun 2004 15:01:42 -0000 1.4
+++ src/lib/XShade.c.pamphlet 27 Jun 2004 19:27:04 -0000
@@ -50,7 +50,6 @@
#include "useproto.h"
#include <stdio.h>
-#include <malloc.h>
#include <stdlib.h>
#include <X11/Xlib.h>
Index: src/lib/cfuns-c.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/cfuns-c.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 cfuns-c.c.pamphlet
--- src/lib/cfuns-c.c.pamphlet 27 Jun 2004 15:01:43 -0000 1.4
+++ src/lib/cfuns-c.c.pamphlet 27 Jun 2004 19:27:04 -0000
@@ -52,7 +52,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: src/lib/fnct_key.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/fnct_key.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 fnct_key.c.pamphlet
--- src/lib/fnct_key.c.pamphlet 27 Jun 2004 15:01:43 -0000 1.4
+++ src/lib/fnct_key.c.pamphlet 27 Jun 2004 19:27:06 -0000
@@ -352,7 +352,7 @@
close(fd);
}
}
- bsdSignal(SIGCLD, null_fnct,RestartSystemCalls);
+ bsdSignal(SIGCHLD, null_fnct,RestartSystemCalls);
switch (id = fork()) {
case -1:
perror("Special key");
Index: src/lib/openpty.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/openpty.c.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 openpty.c.pamphlet
--- src/lib/openpty.c.pamphlet 27 Jun 2004 15:01:44 -0000 1.7
+++ src/lib/openpty.c.pamphlet 27 Jun 2004 19:27:06 -0000
@@ -92,7 +92,7 @@
#endif
{
-#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform)
||defined(AIX370platform)
+#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform)
||defined(AIX370platform) || defined(FREEBSDplatform)
int looking = 1, i;
int oflag = O_RDWR; /* flag for opening the pty */
@@ -204,7 +204,7 @@
sprintf(serv, "/dev/ttyp%02x", channelNo);
channelNo++;
#endif
-#if defined(SUNplatform) || defined (HP9platform) || defined(LINUXplatform)
+#if defined(FREEBSDplatform) || defined(SUNplatform) || defined (HP9platform)
|| defined(LINUXplatform)
static int channelNo = 0;
static char group[] = "pqrstuvwxyzPQRST";
static int groupNo = 0;
Index: src/lib/pixmap.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/pixmap.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 pixmap.c.pamphlet
--- src/lib/pixmap.c.pamphlet 27 Jun 2004 15:01:44 -0000 1.4
+++ src/lib/pixmap.c.pamphlet 27 Jun 2004 19:27:16 -0000
@@ -361,8 +361,7 @@
write_pixmap_file(Display *dsp, int scr, char *fn, Window wid, int x, int y,
int width,int height)
#endif
{
- XpmAttributes attr;
- XImage *xi,*xireturn;
+ XImage *xi;
int status;
/* reads image structure in ZPixmap format */
Index: src/lib/wct.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/wct.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 wct.c.pamphlet
--- src/lib/wct.c.pamphlet 27 Jun 2004 15:01:44 -0000 1.4
+++ src/lib/wct.c.pamphlet 27 Jun 2004 19:27:16 -0000
@@ -287,7 +287,7 @@
printTime((long *)&(pwct->ftime));
cc = skimString(pwct->fimage, pwct->fsize, NHEAD, NTAIL);
printf("%s", " " + (cc - (NHEAD + NTAIL)));
- printf(" [%d w, %d c]", pwct->wordc, pwct->fsize);
+ printf(" [%d w, %ld c]", pwct->wordc, (long)pwct->fsize);
printf("\n");
#ifdef SHOW_WORDS
Index: src/scripts/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/scripts/Makefile.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile.pamphlet
--- src/scripts/Makefile.pamphlet 27 Jun 2004 15:01:44 -0000 1.2
+++ src/scripts/Makefile.pamphlet 27 Jun 2004 19:27:16 -0000
@@ -19,6 +19,10 @@
@cp -pr * ${OUT}
@mkdir -p ${OUT}/tex
@rm -f ${OUT}/Makefile*
+
+clean:
+ @echo 2 cleaning ${SRC}/scripts
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/scripts/document
===================================================================
RCS file: /cvsroot/axiom/axiom/src/scripts/document,v
retrieving revision 1.3
diff -u -d -r1.3 document
--- src/scripts/document 12 Nov 2003 11:16:15 -0000 1.3
+++ src/scripts/document 27 Jun 2004 19:27:16 -0000
@@ -1,12 +1,14 @@
#!/bin/sh
+
latex=`which latex`
if [ "$latex" = "" ] ; then
echo document ERROR You must install latex first
exit 0
fi
-tangle=$AXIOM/bin/lib/notangle
-weave=$AXIOM/bin/lib/noweave
+tangle=notangle
+weave=noweave
+
if [ "$#" = "3" ]; then
REDIRECT=$2
FILE=`basename $3 .pamphlet`
- Re: [Gcl-devel] Re: [Axiom-developer] Axiom cvs 040624 build error, (continued)
- Re: [Gcl-devel] Re: [Axiom-developer] Axiom cvs 040624 build error, Magnus Larsson, 2004/06/30
- Re: [Gcl-devel] Re: [Axiom-developer] Axiom cvs 040624 build error, Camm Maguire, 2004/06/30
- Re: [Axiom-developer] Axiom cvs 040624 build error, Magnus Larsson, 2004/06/30
- Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), David MENTRE, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), Mark Murray, 2004/06/27
- [Axiom-developer] Re: Axiom & internal/external GCL, David MENTRE, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), root, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error),
Mark Murray <=
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), root, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), Mark Murray, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), root, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), Mark Murray, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), root, 2004/06/27
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), Camm Maguire, 2004/06/28
- Re: Axiom & internal/external GCL (was: Re: [Axiom-developer] Axiom cvs 040624 build error), root, 2004/06/28
- Re: [Axiom-developer] Axiom cvs 040624 build error, Camm Maguire, 2004/06/30