Hi, This patchlet updates GCL to the most recent version of GCL-2.6.8pre (as of yesterday night, central time). It also has us stop applying toploop.patch: the patch failed to apply cleanly because the portion of code it touches had been slightly reworked. Consequently, I remove the patch altogether.
Built and tested on an x86-suse-linux where GCL is not installed. -- Gaby lsp/ 2006-10-26 Gabriel Dos Reis <[EMAIL PROTECTED]> * Makefile.pamphlet ($(axiom_build_bindir)/gcl): Don't apply toploop.patch anymore. (<<gcl-2.6.8pre.toploop.patch>>): Remove. * Makefile.in: Regenerate. zips/ 2006-10-26 Gabriel Dos Reis <[EMAIL PROTECTED]> * gcl-2.6.8pre.tgz: Update. * gcl-2.6.8pre.unixport.init_gcl.lsp.in.patch: Remove. *** lsp/Makefile.in (revision 15151) --- lsp/Makefile.in (local) *************** $(GCLVERSION): *** 21,29 **** $(TAR) -zxf $(axiom_optional_srcdir)/${GCLVERSION}.tgz $(axiom_build_bindir)/gcl: $(GCLVERSION) - @(cd ${GCLVERSION}/unixport ; \ - echo 7 applying toploop patch to unixport/init_gcl.lsp ; \ - $(PATCH) < $(axiom_optional_srcdir)/${GCLVERSION}.unixport.init_gcl.lsp.in.patch ) (cd ${GCLVERSION} && \ ./configure --prefix=$(axiom_builddir) --disable-xgcl ${GCLOPTS} && \ ${ENV} $(MAKE) && $(ENV) $(MAKE) install) --- 21,26 ---- *** lsp/Makefile.pamphlet (revision 15151) --- lsp/Makefile.pamphlet (local) *************** requires us to have XDR enabled. *** 81,101 **** $(PATCH) < $(axiom_optional_srcdir)/${GCLVERSION}.unixport.makefile.patch ) @ - \subsubsection{toploop patch} - This patch turns off the banner display every time GCL starts. - We could use the -batch flag but that would be a pervasive change. - It isn't critical to the system builds but we will later be - capturing stdin and stdout and we do not want extra information - printed. - - Now, for some reason, lisp needs to tell you what the temporary directory - for the compiler will be. We eliminate this noise as well as the banner. - <<gcl-2.6.8pre.toploop.patch>>= - @(cd ${GCLVERSION}/unixport ; \ - echo 7 applying toploop patch to unixport/init_gcl.lsp ; \ - $(PATCH) < $(axiom_optional_srcdir)/${GCLVERSION}.unixport.init_gcl.lsp.in.patch ) - @ - \subsubsection{collectfn fix} In this version we have created a new subdirectory for use by GCL during compile time at [[obj/sys/lsp]]. We copy two files from --- 81,86 ---- *************** $(GCLVERSION): *** 122,128 **** $(TAR) -zxf $(axiom_optional_srcdir)/${GCLVERSION}.tgz $(axiom_build_bindir)/gcl: $(GCLVERSION) - <<gcl-2.6.8pre.toploop.patch>> <<gclConfigureMake>> @ --- 107,112 ---- *** zips/gcl-2.6.8pre.unixport.init_gcl.lsp.in.patch (revision 15151) --- zips/gcl-2.6.8pre.unixport.init_gcl.lsp.in.patch (local) *************** *** 1,17 **** - --- init_gcl.lsp.in Mon Jan 9 12:24:57 2006 - +++ init_gcl.lsp.in.tpd Mon Apr 17 20:40:05 2006 - @@ -85,12 +85,12 @@ - (cond ((si::get-command-arg "-batch") - (setq si::*top-level-hook* 'bye)) - ((si::get-command-arg "-f")) - - (t (format t si::*system-banner*) - + (t (format nil si::*system-banner*) - (let* ((c (find-package "COMPILER")) - (tmp (and c (find-symbol "*TMP-DIR*" c)))) - (when tmp - (setf (symbol-value tmp) (funcall (find-symbol "GET-TEMP-DIR" c))) - - (format t "Temporary directory for compiler files set to ~a~%" (symbol-value tmp)))))) - + (format nil "Temporary directory for compiler files set to ~a~%" (symbol-value tmp)))))) - (setq si::*ihs-top* 1) - (in-package 'system::user) (incf system::*ihs-top* 2) - (funcall system::*old-top-level*)) --- 0 ---- _______________________________________________ Axiom-developer mailing list Axiom-developer@nongnu.org http://lists.nongnu.org/mailman/listinfo/axiom-developer