[Axiom-developer] [build-improvements] GCL-2.6.7 is history

[Gabriel Dos Reis]

Hi,

  with this, we no longer have to care about GCL-2.6.7 -- as we still
have gcl-2.6.8pre.tgz.

-- Gaby
2006-08-26  Gabriel Dos Reis  <address@hidden>

        * Makefile.pamphlet (GCLVERSION): Remove support for 2.6.7.

lsp/
2006-08-26  Gabriel Dos Reis  <address@hidden>

        * Makefile.pamphlet: Remove support for 2.6.7.

zips/
2006-08-26  Gabriel Dos Reis  <address@hidden>

        * gcl-2.6.8pre.configure.in.patch: Delete.
        * gcl-2.6.8pre.configure.patch: Likewise.

        * gcl-2.6.7.tgz: Delete.
        * gcl-2.6.7.configure.in.patch: Likewise.
        * gcl-2.6.7.h.linux.defs.patch: Likewise.
        * gcl-2.6.7.unixport.init_gcl.lsp.in.patch: Likewise.
        * gcl-2.6.7.unixport.makefile.patch: Likewise.

*** Makefile.in (revision 15809)
--- Makefile.in (local)
*************** SPD=$(shell pwd)
*** 42,48 ****
  SYS=$(notdir $(AXIOM))
  SPAD=${SPD}/mnt/${SYS}
  LSP=${SPD}/lsp
- #GCLVERSION=gcl-2.6.7
  GCLVERSION=gcl-2.6.8pre
  GCLDIR=${LSP}/${GCLVERSION}
  SRC=${SPD}/src
--- 42,47 ----
*** Makefile.pamphlet   (revision 15809)
--- Makefile.pamphlet   (local)
*************** lsp/Makefile.pamphlet file and get the c
*** 850,856 ****
  forget to erase the lsp/Makefile the wrong patches will be applied.
  
  <<GCLVERSION>>=
- #GCLVERSION=gcl-2.6.7
  GCLVERSION=gcl-2.6.8pre
  @
  
--- 850,855 ----
*** lsp/Makefile.pamphlet       (revision 15809)
--- lsp/Makefile.pamphlet       (local)
*************** variable and move them up to the top lev
*** 44,65 ****
        echo '(progn (load "cmpnew/gcl_collectfn.lsp") (load 
"lsp/sys-proclaim.lisp") (compiler::emit-fn t) (system::save-system 
"${OUT}/lisp"))' | unixport/saved_gcl )
  @
  
! \section{Gnu Common Lisp 2.6.7}
! There is a typo in configure.in that is only detected under some
! versions of bash. The problem is a missing single-quote mark.
! <<gcl-2.6.7.configure.in.patch>>=
!       @(cd ${GCLVERSION} ; \
!         echo 28a applying configure.in patch ; \
!         ${PATCH} <${SPD}/zips/${GCLVERSION}.configure.in.patch )
! @
! <<gcl-2.6.7.socket.patch>>=
!       @(cd ${GCLVERSION}/h ; \
!         echo 3 applying EXTRAS patch to h/linux.defs ; \
!         ${PATCH} <${SPD}/zips/${GCLVERSION}.h.linux.defs.patch )
!       @(echo 4 setup ini files for EXTRAS patch ; \
!         touch ${OBJ}/${SYS}/lib/cfuns-c.ini ; \
!         touch ${OBJ}/${SYS}/lib/sockio-c.ini )
! @
  <<gcl-2.6.8pre.socket.patch>>=
        @(cd ${GCLVERSION}/h ; \
          echo 3 applying EXTRAS patch to h/linux.defs ; \
--- 44,50 ----
        echo '(progn (load "cmpnew/gcl_collectfn.lsp") (load 
"lsp/sys-proclaim.lisp") (compiler::emit-fn t) (system::save-system 
"${OUT}/lisp"))' | unixport/saved_gcl )
  @
  
! \section{Gnu Common Lisp 2.6.8pre}
  <<gcl-2.6.8pre.socket.patch>>=
        @(cd ${GCLVERSION}/h ; \
          echo 3 applying EXTRAS patch to h/linux.defs ; \
*************** versions of bash. The problem is a missi
*** 71,81 ****
  \subsubsection{fortran patch}
  Communication over sockets (basically to the NAG fortran library)
  requires us to have XDR enabled.
- <<gcl-2.6.7.libspad.patch>>=
-       @(cd ${GCLVERSION}/unixport ; \
-         echo 6 applying libspad.a patch to unixport/makefile ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.unixport.makefile.patch )
- @
  <<gcl-2.6.8pre.libspad.patch>>=
        @(cd ${GCLVERSION}/unixport ; \
          echo 6 applying libspad.a patch to unixport/makefile ; \
--- 56,61 ----
*************** We could use the -batch flag but that wo
*** 87,97 ****
  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.
- <<gcl-2.6.7.toploop.patch>>=
-       @(cd ${GCLVERSION}/unixport ; \
-         echo 7 applying toploop patch to unixport/init_gcl.lsp ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.unixport.init_gcl.lsp.in.patch )
- @
  
  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.
--- 67,72 ----
*************** collects type information. The compile-f
*** 110,123 ****
  type information to a [[.fn]] file as structs. These structs can
  be loaded and written out as a file of lisp proclaims. The sys-proclaim.lisp
  file contains the proclaims for GCL's function definitions.
- <<gcl-2.6.7.collectfn.fix>>=
-       @(cd ${GCLVERSION}/cmpnew ; \
-         echo 26 copy gcl_collectfn.lsp to ${OBJ}/${SYS}/lsp/collectfn.lsp ; \
-         cp gcl_collectfn.lsp ${OBJ}/${SYS}/lsp/collectfn.lsp )
-       @(cd ${GCLVERSION}/lsp ; \
-         echo 27 copy sys-proclaim.lisp to ${OBJ}/${SYS}/lsp/sys-proclaim.lisp 
; \
-         cp sys-proclaim.lisp ${OBJ}/${SYS}/lsp/sys-proclaim.lisp )
- @
  <<gcl-2.6.8pre.collectfn.fix>>=
        @(cd ${GCLVERSION}/cmpnew ; \
          echo 26 copy gcl_collectfn.lsp to ${OBJ}/${SYS}/lsp/collectfn.lsp ; \
--- 85,90 ----
*************** file contains the proclaims for GCL's fu
*** 127,178 ****
          cp sys-proclaim.lisp ${OBJ}/${SYS}/lsp/sys-proclaim.lisp )
  @
  
- \subsection{The GCL-2.6.7 stanza}
- This stanza will be written out when the GCLVERSION variable is
- ``gcl-2.6.7''. It will overwrite the default version. See the 
- top level Makefile.pamphlet.
- <<gcl-2.6.7>>=
- # gcl version 2.6.7
- OUT=${OBJ}/${SYS}/bin
- 
- all:
-       @echo 1 building ${LSP} ${GCLVERSION}
- 
- gcldir: 
-       @echo 2 building ${GCLVERSION}
-       @tar -zxf ${ZIPS}/${GCLVERSION}.tgz
- <<gcl-2.6.7.configure.in.patch>>
- <<gcl-2.6.7.socket.patch>>
- <<gcl-2.6.7.libspad.patch>>
- <<gcl-2.6.7.toploop.patch>>
- <<gcl-2.6.7.collectfn.fix>>
- <<gclConfigureMake>>
-       @echo 13 finished system build on `date` | tee >gcldir
- 
- ccldir: ${LSP}/ccl/Makefile
-       @echo 14 building CCL
-       @mkdir -p ${INT}/ccl
-       @mkdir -p ${OBJ}/${SYS}/ccl
-       @( cd ccl ; ${ENV} ${MAKE} )
- 
- ${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
-       @echo 15 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
-       @( cd ccl ; ${DOCUMENT} ${NOISE} Makefile )
- 
- document:
-       @echo 16 making docs in ${LSP}
-       @mkdir -p ${INT}/doc/lsp/ccl
-       @( cd ccl ; ${ENV} ${MAKE} document )
- 
- clean:
-       @echo 17 cleaning ${LSP}/ccl
-       @( cd ccl ; ${ENV} ${MAKE} clean )
- 
- @
  \subsection{The GCL-2.6.8pre stanza}
- This stanza will be written out when the GCLVERSION variable is
- ``gcl-2.6.8pre''. It will overwrite the default version. See the 
- top level Makefile.pamphlet.
  <<gcl-2.6.8pre>>=
  # gcl version 2.6.8pre
  OUT=${OBJ}/${SYS}/bin
--- 94,100 ----
*************** clean:
*** 248,289 ****
        @echo 24 cleaning ${LSP}/ccl
        @( cd ccl ; ${ENV} ${MAKE} clean )
  @
- <<*>>=
- # gcl version 2.6.8pre
- OUT=${OBJ}/${SYS}/bin
- 
- all:
-       @echo 1 building ${LSP} ${GCLVERSION}
- 
- gcldir: 
-       @echo 2 building ${GCLVERSION}
-       @tar -zxf ${ZIPS}/${GCLVERSION}.tgz
- <<gcl-2.6.8pre.socket.patch>>
- <<gcl-2.6.8pre.libspad.patch>>
- <<gcl-2.6.8pre.toploop.patch>>
- <<gcl-2.6.8pre.collectfn.fix>>
- <<gclConfigureMake>>
-       @echo 13 finished system build on `date` | tee >gcldir
- 
- ccldir: ${LSP}/ccl/Makefile
-       @echo 14 building CCL
-       @mkdir -p ${INT}/ccl
-       @mkdir -p ${OBJ}/${SYS}/ccl
-       @( cd ccl ; ${ENV} ${MAKE} )
- 
- ${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
-       @echo 15 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
-       @( cd ccl ; ${DOCUMENT} ${NOISE} Makefile )
  
! document:
!       @echo 16 making docs in ${LSP}
!       @mkdir -p ${INT}/doc/lsp/ccl
!       @( cd ccl ; ${ENV} ${MAKE} document )
! 
! clean:
!       @echo 17 cleaning ${LSP}/ccl
!       @( cd ccl ; ${ENV} ${MAKE} clean )
  
  @
  \eject
  \begin{thebibliography}{99}
--- 170,182 ----
        @echo 24 cleaning ${LSP}/ccl
        @( cd ccl ; ${ENV} ${MAKE} clean )
  @
  
! This stanza will be written out when the GCLVERSION variable is
! ``gcl-2.6.8pre''. It will overwrite the default version. See the 
! top level Makefile.pamphlet.
  
+ <<*>>=
+ <<gcl-2.6.8pre>>
  @
  \eject
  \begin{thebibliography}{99}
*** zips/gcl-2.6.7.configure.in.patch   (revision 15809)
--- zips/gcl-2.6.7.configure.in.patch   (local)
***************
*** 1,11 ****
- --- configure.in      Sat Jan 15 14:17:17 2005
- +++ configure.in.tpd  Tue Jan 17 09:32:15 2006
- @@ -538,7 +538,7 @@
-       # results, and the version is kept in special file).
-      
-       if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- -         system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
- +         system=MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`
-       fi
-       if test "`uname -s`" = "AIX" ; then
-           system=AIX-`uname -v`.`uname -r`
--- 0 ----
*** zips/gcl-2.6.7.h.linux.defs.patch   (revision 15809)
--- zips/gcl-2.6.7.h.linux.defs.patch   (local)
***************
*** 1,13 ****
- --- linux.defs        Sun Jul 24 12:55:14 2005
- +++ linux.defs.tpd    Sun Jul 24 13:55:26 2005
- @@ -8,6 +8,10 @@
-  
-  # Machine dependent makefile definitions for intel 386,486 running linux
-  
- +# 20031022000 tpd link Axiom's code into the image
- +EXTRAS = ${OBJ}/${SYS}/lib/cfuns-c.o ${OBJ}/${SYS}/lib/sockio-c.o
- +OFLAG = -O
- +
-  LBINDIR=/usr/local/bin
-  
-  #OFLAG       =  -g -Wall
--- 0 ----

Property changes on: zips/gcl-2.6.7.h.linux.defs.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

Files zips/gcl-2.6.7.tgz        (revision 15809) and zips/gcl-2.6.7.tgz (local) 
differ

Property changes on: zips/gcl-2.6.7.tgz
___________________________________________________________________
Name: svn:mime-type
 -application/octet-stream

*** zips/gcl-2.6.7.unixport.init_gcl.lsp.in.patch       (revision 15809)
--- zips/gcl-2.6.7.unixport.init_gcl.lsp.in.patch       (local)
***************
*** 1,13 ****
- --- init_gcl.lsp.in   Sun Jul 24 12:55:39 2005
- +++ init_gcl.lsp.in.tpd       Sun Jul 24 14:04:35 2005
- @@ -84,8 +84,8 @@
-        (bye (if (or compiler::*error-p* (equal result '(nil))) 1 0))))
-     (cond ((si::get-command-arg "-batch")
-         (setq si::*top-level-hook* 'bye))
- -      ((si::get-command-arg "-f"))
- -      (t (format t si::*system-banner*)))
- +      ((si::get-command-arg "-f")))
- +;     (t (format t si::*system-banner*)))
-     (setq si::*ihs-top* 1)
-     (in-package 'system::user) (incf system::*ihs-top* 2)
-     (funcall system::*old-top-level*))
--- 0 ----

Property changes on: zips/gcl-2.6.7.unixport.init_gcl.lsp.in.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

*** zips/gcl-2.6.7.unixport.makefile.patch      (revision 15809)
--- zips/gcl-2.6.7.unixport.makefile.patch      (local)
***************
*** 1,12 ****
- --- makefile  Sun Jul 24 12:55:39 2005
- +++ makefile.tpd      Sun Jul 24 15:40:01 2005
- @@ -14,7 +14,8 @@
-  PORTDIR = $(shell pwd)
-  
-  LD_LIBS_PRE=$(FIRST_FILE) $(addprefix -u ,$(PATCHED_SYMBOLS))
- -LD_LIBS_POST=$(LIBS) $(LIBC) -lgclp $(LAST_FILE)
- +# 20031022000 tpd link axiom's C library code
- +LD_LIBS_POST=$(LIBS) $(LIBC) -lgclp ${OBJ}/${SYS}/lib/libspad.a $(LAST_FILE) 
-  
-  ifeq ($(ARRS),)
-  ARRS:=ar rs
--- 0 ----

Property changes on: zips/gcl-2.6.7.unixport.makefile.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

*** zips/gcl-2.6.8pre.configure.in.patch        (revision 15809)
--- zips/gcl-2.6.8pre.configure.in.patch        (local)
***************
*** 1,11 ****
- --- configure.in      Sat Jan 15 14:17:17 2005
- +++ configure.in.tpd  Tue Jan 17 09:32:15 2006
- @@ -538,7 +538,7 @@
-       # results, and the version is kept in special file).
-      
-       if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- -         system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
- +         system=MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`
-       fi
-       if test "`uname -s`" = "AIX" ; then
-           system=AIX-`uname -v`.`uname -r`
--- 0 ----
*** zips/gcl-2.6.8pre.configure.patch   (revision 15809)
--- zips/gcl-2.6.8pre.configure.patch   (local)
***************
*** 1,11 ****
- --- configure Sat Jan 15 14:17:17 2005
- +++ configure.tpd     Sun Apr 16 23:12:48 2006
- @@ -6187,7 +6187,7 @@
-  echo "configure:6188: checking emacs site lisp directory" >&5
-  if [ "$EMACS_SITE_LISP" = "unknown" ] ; then
-       if [ "$EMACS" != "" ] ; then
- -             EMACS_SITE_LISP=`$EMACS -q -batch --no-site-file -l conftest.el 
2>&1 | sed -e /Loading/d | sed -e /load/d `
- +             EMACS_SITE_LISP=`$EMACS -q -batch --no-site-file -l conftest.el 
2>&1 | grep -v ^Warning: | sed -e /Loading/d | sed -e /load/d `
-       else
-               EMACS_SITE_LISP=""
-       fi
--- 0 ----