[COMMIT] Eliminate a non-Mule build failure from my last
Unicode change
Vin Shelton
acs at alumni.princeton.edu
Thu Nov 15 07:41:57 EST 2007
Hi, Aidan -
Thank you for that fix. It fixed my -debug and non-mule builds, but
my -mule build is still failing (sorry I didn't mention previously
that all 3 of my builds were failing). Here's the relevant info from
the build failure here at work:
Loading /usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-composite.elc...
Loading /usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-x-init.elc...
Loading /usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-tty-init.elc...
Loading /usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/code-init.elc...
Loading /usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-category.elc...
*** Error in XEmacs initialization
(end-of-file "internal input stream")
*** Backtrace
really-early-error-handler((end-of-file "internal input stream"))
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
(load-internal "[internal]")
load-internal("/usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-category.elc"
nil nil nil escape-quoted)
# bind (path handler filename nosuffix nomessage noerror file)
load("/usr/local/build/xemacs-21.5-2007-11-15-mule/lisp/mule/mule-category.elc")
(prog1 (load full-path) (unless (memq (quote quick-build)
internal-error-checking) (garbage-collect)))
(if full-path (prog1 (load full-path) (unless (memq (quote
quick-build) internal-error-checking) (garbage-collect)))
(external-debugging-output (format "\nLoad file %s: not found\n"
file)) nil)
# bind (full-path)
(let ((full-path (locate-file file load-path (if
load-ignore-elc-files (quote (".el" "")) (quote (".elc" ".el" ""))))))
(if full-path (prog1 (load full-path) (unless (memq (quote
quick-build) internal-error-checking) (garbage-collect)))
(external-debugging-output (format "\nLoad file %s: not found\n"
file)) nil))
# bind (file)
pureload("mule/mule-category")
(if (pureload file) nil (external-debugging-output "Fatal error
during load, aborting") (kill-emacs 1))
(unless (pureload file) (external-debugging-output "Fatal error
during load, aborting") (kill-emacs 1))
(while (setq file (car files)) (unless (pureload file)
(external-debugging-output "Fatal error during load, aborting")
(kill-emacs 1)) (setq files (cdr files)))
# bind (file files)
(let ((files preloaded-file-list) file) (while (setq file (car
files)) (unless (pureload file) (external-debugging-output "Fatal
error during load, aborting") (kill-emacs 1)) (setq files (cdr
files))) (when (not (featurep (quote toolbar))) (defun
toolbar-button-p (obj) "No toolbar support." nil) (defun
toolbar-specifier-p (obj) "No toolbar support." nil)) (fmakunbound
(quote pureload)))
(lambda nil (setq load-path (list source-lisp)) (setq
module-load-path (list (expand-file-name "modules" build-directory)))
(external-debugging-output (format "\nUsing load-path %s" load-path))
(external-debugging-output (format "\nUsing module-load-path %s"
module-load-path)) (buffer-disable-undo (get-buffer "*scratch*")) (let
((temp-path (expand-file-name "." (car load-path)))) (setq load-path
(nconc (mapcar (function (lambda (i) (concat i "/"))) (directory-files
temp-path t "^[^-.]" nil (quote dirs-only))) (cons
(file-name-as-directory temp-path) load-path)))) (setq
load-warn-when-source-only t) (defun pureload (file) (let ((full-path
(locate-file file load-path (if load-ignore-elc-files (quote (".el"
"")) (quote (".elc" ".el" "")))))) (if full-path (prog1 (load
full-path) (unless (memq (quote quick-build) internal-error-checking)
(garbage-collect))) (external-debugging-output (format "\nLoad file
%s: not found\n" file)) nil))) (load (expand-file-name
"dumped-lisp.el" source-lisp)) (let ((files preloaded-file-list) file)
(while (setq file (car files)) (unless (pureload file)
(external-debugging-output "Fatal error during load, aborting")
(kill-emacs 1)) (setq files (cdr files))) (when (not (featurep (quote
toolbar))) (defun toolbar-button-p (obj) "No toolbar support." nil)
(defun toolbar-specifier-p (obj) "No toolbar support." nil))
(fmakunbound (quote pureload))) (packages-load-package-dumped-lisps
late-package-load-path))()
# (unwind-protect ...)
call-with-condition-handler(really-early-error-handler (lambda nil
(setq load-path (list source-lisp)) (setq module-load-path (list
(expand-file-name "modules" build-directory)))
(external-debugging-output (format "\nUsing load-path %s" load-path))
(external-debugging-output (format "\nUsing module-load-path %s"
module-load-path)) (buffer-disable-undo (get-buffer "*scratch*")) (let
((temp-path (expand-file-name "." (car load-path)))) (setq load-path
(nconc (mapcar (function (lambda (i) (concat i "/"))) (directory-files
temp-path t "^[^-.]" nil (quote dirs-only))) (cons
(file-name-as-directory temp-path) load-path)))) (setq
load-warn-when-source-only t) (defun pureload (file) (let ((full-path
(locate-file file load-path (if load-ignore-elc-files (quote (".el"
"")) (quote (".elc" ".el" "")))))) (if full-path (prog1 (load
full-path) (unless (memq (quote quick-build) internal-error-checking)
(garbage-collect))) (external-debugging-output (format "\nLoad file
%s: not found\n" file)) nil))) (load (expand-file-name
"dumped-lisp.el" source-lisp)) (let ((files preloaded-file-list) file)
(while (setq file (car files)) (unless (pureload file)
(external-debugging-output "Fatal error during load, aborting")
(kill-emacs 1)) (setq files (cdr files))) (when (not (featurep (quote
toolbar))) (defun toolbar-button-p (obj) "No toolbar support." nil)
(defun toolbar-specifier-p (obj) "No toolbar support." nil))
(fmakunbound (quote pureload))) (packages-load-package-dumped-lisps
late-package-load-path)))
# bind (stack-trace-on-error)
(let ((stack-trace-on-error nil)) (call-with-condition-handler
(quote really-early-error-handler) (function (lambda nil (setq
load-path (list source-lisp)) (setq module-load-path (list
(expand-file-name "modules" build-directory)))
(external-debugging-output (format "\nUsing load-path %s" load-path))
(external-debugging-output (format "\nUsing module-load-path %s"
module-load-path)) (buffer-disable-undo (get-buffer "*scratch*")) (let
((temp-path (expand-file-name "." (car load-path)))) (setq load-path
(nconc (mapcar (function (lambda (i) (concat i "/"))) (directory-files
temp-path t "^[^-.]" nil (quote dirs-only))) (cons
(file-name-as-directory temp-path) load-path)))) (setq
load-warn-when-source-only t) (defun pureload (file) (let ((full-path
(locate-file file load-path (if load-ignore-elc-files (quote (".el"
"")) (quote (".elc" ".el" "")))))) (if full-path (prog1 (load
full-path) (unless (memq (quote quick-build) internal-error-checking)
(garbage-collect))) (external-debugging-output (format "\nLoad file
%s: not found\n" file)) nil))) (load (expand-file-name
"dumped-lisp.el" source-lisp)) (let ((files preloaded-file-list) file)
(while (setq file (car files)) (unless (pureload file)
(external-debugging-output "Fatal error during load, aborting")
(kill-emacs 1)) (setq files (cdr files))) (when (not (featurep (quote
toolbar))) (defun toolbar-button-p (obj) "No toolbar support." nil)
(defun toolbar-specifier-p (obj) "No toolbar support." nil))
(fmakunbound (quote pureload))) (packages-load-package-dumped-lisps
late-package-load-path)))))
# bind (gc-cons-threshold)
(let ((gc-cons-threshold (if (and purify-flag (not (memq (quote
quick-build) internal-error-checking))) 30000 3000000))) (let
((stack-trace-on-error nil)) (call-with-condition-handler (quote
really-early-error-handler) (function (lambda nil (setq load-path
(list source-lisp)) (setq module-load-path (list (expand-file-name
"modules" build-directory))) (external-debugging-output (format
"\nUsing load-path %s" load-path)) (external-debugging-output (format
"\nUsing module-load-path %s" module-load-path)) (buffer-disable-undo
(get-buffer "*scratch*")) (let ((temp-path (expand-file-name "." (car
load-path)))) (setq load-path (nconc (mapcar (function (lambda (i)
(concat i "/"))) (directory-files temp-path t "^[^-.]" nil (quote
dirs-only))) (cons (file-name-as-directory temp-path) load-path))))
(setq load-warn-when-source-only t) (defun pureload (file) (let
((full-path (locate-file file load-path (if load-ignore-elc-files
(quote (".el" "")) (quote (".elc" ".el" "")))))) (if full-path (prog1
(load full-path) (unless (memq (quote quick-build)
internal-error-checking) (garbage-collect)))
(external-debugging-output (format "\nLoad file %s: not found\n"
file)) nil))) (load (expand-file-name "dumped-lisp.el" source-lisp))
(let ((files preloaded-file-list) file) (while (setq file (car files))
(unless (pureload file) (external-debugging-output "Fatal error during
load, aborting") (kill-emacs 1)) (setq files (cdr files))) (when (not
(featurep (quote toolbar))) (defun toolbar-button-p (obj) "No toolbar
support." nil) (defun toolbar-specifier-p (obj) "No toolbar support."
nil)) (fmakunbound (quote pureload)))
(packages-load-package-dumped-lisps late-package-load-path))))) (setq
preloaded-file-list (mapcar (function file-name-sans-extension)
preloaded-file-list)) (setq load-warn-when-source-only nil) (setq
debugger (quote debug)) (when (member "no-site-file"
command-line-args) (setq site-start-file nil)) (when (load "site-load"
t) (garbage-collect)) (when purify-flag (message "Finding pointers to
doc strings...") (Snarf-documentation "DOC") (message "Finding
pointers to doc strings...done") (Verify-documentation)) (when
(stringp site-start-file) (load "site-init" t)) (setq
current-load-list nil) (garbage-collect) (buffer-enable-undo
"*scratch*"))
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
(load-internal "[internal]")
load("/usr/local/src/xemacs-21.5-2007-11-15-mule/src/../lisp/loadup.el")
# (condition-case ... . error)
# (catch top-level ...)
*** Killing XEmacs
make[1]: *** [xemacs] Error 255
make[1]: Leaving directory `/usr/local/build/xemacs-21.5-2007-11-15-mule/src'
make: *** [src] Error 2
Regards,
Vin
On Nov 15, 2007 5:09 AM, Aidan Kehoe <kehoea at parhasard.net> wrote:
>
> Ar an ceathrú lá déag de mí na Samhain, scríobh Vin Shelton:
>
> > Aidan,
> >
> > With current 21.5 CVS, I'm getting the following errors:
> >
> > icc -c -Os -ip -Demacs -I. -I/opt/src/xemacs-21.5-2007-11-14/src
> > -DHAVE_CONFIG_H -I/opt/include
> > /opt/src/xemacs-21.5-2007-11-14/src/unicode.c
> > /opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2865): error: identifier
> > "Vnumber_of_jit_charsets" is undefined
> > staticpro (&Vnumber_of_jit_charsets);
> > ^
> >
> > /opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2867): error: identifier
> > "Vlast_jit_charset_final" is undefined
> > staticpro (&Vlast_jit_charset_final);
> > ^
> >
> > /opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2869): error: identifier
> > "Vcharset_descr" is undefined
> > staticpro (&Vcharset_descr);
> > ^
> >
> > compilation aborted for /opt/src/xemacs-21.5-2007-11-14/src/unicode.c (code 2)
> > make[1]: *** [unicode.o] Error 2
> > make[1]: Leaving directory `/opt/build/xemacs-21.5-2007-11-14/src'
> > make: *** [src] Error 2
> >
> > Is this related to your change?
>
> Yes--the attached change fixes the non-Mule build for me. (The absence of
> Mule was the difference between what I tested locally and what your
> Installation file said.) Thank you for the report!
>
> APPROVE COMMIT
>
> NOTE: This patch has been committed.
>
> src/ChangeLog addition:
>
> 2007-11-15 Aidan Kehoe <kehoea at parhasard.net>
>
> * unicode.c (coding_system_type_create_unicode):
> * unicode.c (vars_of_unicode):
> Move the initialisation of Vnumber_of_jit_charsets,
> Vlast_jit_charset_final, Vcharset_descr to an #ifdef MULE block in
> vars_of_unicode. Fixes a build failure reported by Vin
> Shelton--thank you Vin!
>
>
> XEmacs Trunk source patch:
> Diff command: cvs -q diff -u
> Files affected: src/unicode.c
> ===================================================================
> RCS
>
> Index: src/unicode.c
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v
> retrieving revision 1.39
> diff -u -r1.39 unicode.c
> --- src/unicode.c 2007/11/14 19:41:09 1.39
> +++ src/unicode.c 2007/11/15 10:02:34
> @@ -2862,14 +2862,6 @@
> void
> coding_system_type_create_unicode (void)
> {
> - staticpro (&Vnumber_of_jit_charsets);
> - Vnumber_of_jit_charsets = make_int (0);
> - staticpro (&Vlast_jit_charset_final);
> - Vlast_jit_charset_final = make_char (0x30);
> - staticpro (&Vcharset_descr);
> - Vcharset_descr
> - = build_string ("Mule charset for otherwise unknown Unicode code points.");
> -
> INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA (unicode, "unicode-coding-system-p");
> CODING_SYSTEM_HAS_METHOD (unicode, print);
> CODING_SYSTEM_HAS_METHOD (unicode, convert);
> @@ -2907,6 +2899,14 @@
> Fprovide (intern ("unicode"));
>
> #ifdef MULE
> + staticpro (&Vnumber_of_jit_charsets);
> + Vnumber_of_jit_charsets = make_int (0);
> + staticpro (&Vlast_jit_charset_final);
> + Vlast_jit_charset_final = make_char (0x30);
> + staticpro (&Vcharset_descr);
> + Vcharset_descr
> + = build_string ("Mule charset for otherwise unknown Unicode code points.");
> +
> staticpro (&Vlanguage_unicode_precedence_list);
> Vlanguage_unicode_precedence_list = Qnil;
>
>
> --
> ¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
> precipitadamente de la aldea por culpo de la escasez de rinocerontes?
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Installation
Type: application/octet-stream
Size: 3350 bytes
Desc: not available
Url : http://lists.xemacs.org/pipermail/xemacs-beta/attachments/20071115/6c4223aa/Installation.obj
More information about the XEmacs-Beta
mailing list
