[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gcl-devel] conditions/clos/gcl unified build patch and instru
From: |
Camm Maguire |
Subject: |
Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions. |
Date: |
10 Jun 2002 18:49:26 -0400 |
Hi Vadim! Thanks for the patch!!
Unfortunately, it breaks the maxima build. As you have it, the final
maxima link complains that the package "COMMON-LISP-USER" does not
exist. When I reverted the missing lines building this package in C,
the error is that package "CONDITIONS" does not exist. Even when one
can fire up unixport/saved_gcl and see the conditions package.
Hope to look into this soon so we can commit something like the patch
below.
Take care,
"Vadim V. Zhytnikov" <address@hidden> writes:
> This is a multi-part message in MIME format.
> --------------020207010209010609040406
> Content-Type: text/plain; charset=KOI8-R; format=flowed
> Content-Transfer-Encoding: 7bit
>
> The attached patch to current CVS allows to build GCL with
> new packages setup. Please try it. I've removed creation
> of COMMON-LISP-USER package on C level. Instead of it
> USER is renamed to COMMON-LISP-USER with aliases CL-USER
> and USER.
>
> Best wishes,
>
> Vadim
>
> --------------020207010209010609040406
> Content-Type: text/plain;
> name="gcl.patch"
> Content-Transfer-Encoding: 7bit
> Content-Disposition: inline;
> filename="gcl.patch"
>
> diff -uNr gcl-2.5.0-orig/clcs/makefile gcl-2.5.0/clcs/makefile
> --- gcl-2.5.0-orig/clcs/makefile Sat Jun 8 09:59:04 2002
> +++ gcl-2.5.0/clcs/makefile Mon Jun 10 19:50:45 2002
> @@ -1,6 +1,12 @@
>
> -LISP=../unixport/saved_gcl
> +LISP=../pcl/saved_gcl
> compile: ${LISP}
> - echo '(jamei-load-lcs :compile)' | ${LISP}
> + echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs
> :compile)' | ${LISP}
> +
> +saved_gcl: ${LISP}
> + echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs
> :compiled)(system::save-system "saved_gcl")' | ${LISP}
> + mv saved_gcl ../unixport/saved_gcl
> +clean:
> + rm -f *.o
>
> -include ../makedefs
> diff -uNr gcl-2.5.0-orig/h/att_ext.h gcl-2.5.0/h/att_ext.h
> --- gcl-2.5.0-orig/h/att_ext.h Sat Jun 8 09:59:09 2002
> +++ gcl-2.5.0/h/att_ext.h Mon Jun 10 22:55:30 2002
> @@ -348,7 +348,6 @@
> EXTER object lisp_package;
> EXTER object user_package;
> EXTER object common_lisp_package;
> -EXTER object common_lisp_user_package;
> EXTER object keyword_package;
> EXTER object system_package;
> EXTER object sLApackageA;
> diff -uNr gcl-2.5.0-orig/h/notcomp.h gcl-2.5.0/h/notcomp.h
> --- gcl-2.5.0-orig/h/notcomp.h Sat Jun 8 09:59:09 2002
> +++ gcl-2.5.0/h/notcomp.h Mon Jun 10 22:54:52 2002
> @@ -21,7 +21,7 @@
> EXTER int gc_enabled, saving_system;
>
> EXTER object lisp_package,user_package;
> -EXTER object common_lisp_package,common_lisp_user_package;
> +EXTER object common_lisp_package;
> EXTER char *core_end;
> EXTER int catch_fatal;
> EXTER int real_maxpage;
> diff -uNr gcl-2.5.0-orig/makefile gcl-2.5.0/makefile
> --- gcl-2.5.0-orig/makefile Sat Jun 8 09:59:04 2002
> +++ gcl-2.5.0/makefile Mon Jun 10 19:57:12 2002
> @@ -20,6 +20,8 @@
> LSPDIR = lsp
> CMPDIR = cmpnew
> PORTDIR = unixport
> +CLCSDIR = clcs
> +PCLDIR = pcl
> MPDIR = mp
> GMP_DIR = gmp/
>
> @@ -31,6 +33,9 @@
> (cd $(LSPDIR); make all)
> (cd $(CMPDIR); make all)
> (cd $(PORTDIR); make saved_gcl)
> + (cd $(PCLDIR); make -f makefile.gcl compile; make -f makefile.gcl
> saved_gcl)
> + (cd $(CLCSDIR); make compile; make saved_gcl)
> + (cd $(PORTDIR); make ansi_cl)
> make command
>
> # After making successfully send in a notification to
> @@ -120,6 +125,7 @@
> (cd $(PORTDIR); make clean)
> (cd gcl-tk ; make clean)
> -(cd gmp ; make distclean)
> + (cd clcs ; make clean)
> (cd info ; make clean)
> rm -f foo.tcl config.log makedefs makedefsafter config.cache
> config.status makedefc
> rm -f h/config.h h/gclincl.h h/cmpinclude.h
> diff -uNr gcl-2.5.0-orig/o/package.d gcl-2.5.0/o/package.d
> --- gcl-2.5.0-orig/o/package.d Sat Jun 8 09:59:10 2002
> +++ gcl-2.5.0/o/package.d Mon Jun 10 22:54:02 2002
> @@ -1059,10 +1059,6 @@
> common_lisp_package
> = make_package(make_simple_string("COMMON-LISP"),
> Cnil, Cnil,47,509);
> - common_lisp_user_package
> - = make_package(make_simple_string("COMMON-LISP-USER"),
> - Cnil,
> - make_cons(common_lisp_package, Cnil),509,97);
> keyword_package
> = make_package(make_simple_string("KEYWORD"),
> Cnil, Cnil,11,509);
> diff -uNr gcl-2.5.0-orig/pcl/impl/gcl/makefile.gcl
> gcl-2.5.0/pcl/impl/gcl/makefile.gcl
> --- gcl-2.5.0-orig/pcl/impl/gcl/makefile.gcl Sat Apr 29 03:56:12 1995
> +++ gcl-2.5.0/pcl/impl/gcl/makefile.gcl Mon Jun 10 19:50:45 2002
> @@ -5,7 +5,7 @@
> # make -f makefile.gcl saved_pcl
>
>
> -LISP=gcl
> +LISP=../unixport/saved_gcl
>
>
> SETUP='(load "sys-package.lisp")' \
> @@ -18,8 +18,11 @@
> compile:
> echo ${SETUP} '(pcl::compile-pcl)' | ${LISP}
>
> -saved_pcl:
> - echo ${SETUP} '(pcl::load-pcl)(si::save-system "saved_pcl")' | ${LISP}
> +saved_gcl:
> + echo ${SETUP} '(pcl::load-pcl)(si::save-system "saved_gcl")' | ${LISP}
> +
> +clean:
> + rm -f *.o *.fn
>
>
> # remake the sys-package.lisp and sys-proclaim.lisp files
> diff -uNr gcl-2.5.0-orig/unixport/ansi_cl.lisp gcl-2.5.0/unixport/ansi_cl.lisp
> --- gcl-2.5.0-orig/unixport/ansi_cl.lisp Thu Jan 1 03:00:00 1970
> +++ gcl-2.5.0/unixport/ansi_cl.lisp Mon Jun 10 23:14:24 2002
> @@ -0,0 +1,98 @@
> +(setq clcs_shadow
> + '(CONDITIONS::BREAK
> + CONDITIONS::ERROR
> + CONDITIONS::CERROR
> + CONDITIONS::WARN
> + CONDITIONS::CHECK-TYPE
> + CONDITIONS::ASSERT
> + CONDITIONS::ETYPECASE
> + CONDITIONS::CTYPECASE
> + CONDITIONS::ECASE
> + CONDITIONS::CCASE ))
> +
> +(setq lisp_unexport
> + '(LISP::LAMBDA-BLOCK-CLOSURE
> + LISP::BYE
> + LISP::QUIT
> + LISP::EXIT
> + LISP::IEEE-FLOATING-POINT
> + LISP::DEFENTRY
> + LISP::VOID
> + LISP::ALLOCATE-CONTIGUOUS-PAGES
> + LISP::UNSIGNED-SHORT
> + LISP::DOUBLE
> + LISP::BY
> + LISP::GBC
> + LISP::DEFCFUN
> + LISP::SAVE
> + LISP::MAXIMUM-CONTIGUOUS-PAGES
> + LISP::SPICE
> + LISP::DEFLA
> + LISP::ALLOCATED-PAGES
> + LISP::SUN
> + LISP::INT
> + LISP::USE-FAST-LINKS
> + LISP::CFUN
> + LISP::UNSIGNED-CHAR
> + LISP::HELP
> + LISP::HELP*
> + LISP::MACRO
> + LISP::*BREAK-ENABLE*
> + LISP::CLINES
> + LISP::LAMBDA-CLOSURE
> + LISP::OBJECT
> + LISP::FAT-STRING
> + LISP::SIGNED-SHORT
> + LISP::MC68020
> + LISP::LAMBDA-BLOCK
> + LISP::TAG
> + LISP::PROCLAMATION
> + LISP::ALLOCATED-CONTIGUOUS-PAGES
> + LISP::*EVAL-WHEN-COMPILE*
> + LISP::SIGNED-CHAR
> + LISP::*IGNORE-MAXIMUM-PAGES*
> + LISP::*LINK-ARRAY*
> + LISP::KCL
> + LISP::BSD
> + LISP::ALLOCATE-RELOCATABLE-PAGES
> + LISP::ALLOCATE
> + LISP::UNIX
> + LISP::MAXIMUM-ALLOCATABLE-PAGES
> + LISP::ALLOCATED-RELOCATABLE-PAGES
> + LISP::SYSTEM
> + LISP::KYOTO
> + LISP::CCLOSURE))
> +
> +(do-external-symbols (s "LISP")
> + (if (not(member s lisp_unexport))
> + (progn
> + (import (list s) "COMMON-LISP")
> + (import (list s) "USER")) ))
> +
> +(do-external-symbols (s "PCL")
> + (import (list s) "COMMON-LISP")
> + (import (list s) "USER"))
> +
> +(do-external-symbols (s "CONDITIONS")
> + (if (member s clcs_shadow)
> + (progn
> + (shadowing-import (list s) "COMMON-LISP")
> + (shadowing-import (list s) "USER"))
> + (progn
> + (import (list s) "COMMON-LISP")
> + (import (list s) "USER"))))
> +
> +(do-symbols (s "COMMON-LISP")
> + (export (list s) "COMMON-LISP"))
> +
> +(makunbound 'clcs_shadow)
> +(makunbound 'lisp_unexport)
> +(unintern 'clcs_shadow)
> +(unintern 'lisp_unexport)
> +(unintern 'int)
> +
> +
> (rename-package 'common-lisp 'common-lisp '(cl))
> +(rename-package 'user 'common-lisp-user '(cl-user user))
> +
> +(si::save-system "saved_ansi_cl")
> +
> diff -uNr gcl-2.5.0-orig/unixport/makefile gcl-2.5.0/unixport/makefile
> --- gcl-2.5.0-orig/unixport/makefile Sat Jun 8 09:59:10 2002
> +++ gcl-2.5.0/unixport/makefile Mon Jun 10 19:59:53 2002
> @@ -75,6 +75,11 @@
>
> SYSTEM=gcl
>
> +ansi_cl: saved_$(SYSTEM) ansi_cl.lisp
> + $(PORTDIR)/saved_$(SYSTEM) < ansi_cl.lisp
> + rm -f saved_$(SYSTEM)
> + mv saved_ansi_cl saved_$(SYSTEM)
> +
> $(LSPDIR)/auto_new.lsp: $(LSPDIR)/auto.lsp
> cp $< $@
> [ "$(RL_OBJS)" = "" ] || \
>
> --------------020207010209010609040406--
>
>
>
> _______________________________________________
> Gcl-devel mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/gcl-devel
>
>
--
Camm Maguire address@hidden
==========================================================================
"The earth is but one country, and mankind its citizens." -- Baha'u'llah
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., (continued)
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., John Jorgensen, 2002/06/07
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/07
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/07
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/07
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., John Jorgensen, 2002/06/07
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/08
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/10
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions.,
Camm Maguire <=
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/12
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/12
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/12
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/13
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/14
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/17
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/14
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Camm Maguire, 2002/06/17
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Vadim V. Zhytnikov, 2002/06/12
- Re: [Gcl-devel] conditions/clos/gcl unified build patch and instructions., Peter Wood, 2002/06/11