* Re: Need help with upstream vs Debian emacs-23.4 build differences
2012-06-29 6:49 ` Andreas Schwab
@ 2012-06-29 8:01 ` Svante Signell
2012-07-01 20:58 ` Svante Signell
1 sibling, 0 replies; 4+ messages in thread
From: Svante Signell @ 2012-06-29 8:01 UTC (permalink / raw)
To: Andreas Schwab; +Cc: help-gnu-emacs, emacs-devel
[-- Attachment #1: Type: text/plain, Size: 2841 bytes --]
On Fri, 2012-06-29 at 08:49 +0200, Andreas Schwab wrote:
> Svante Signell <svante.signell@telia.com> writes:
>
> > eshell/esh-groups.el, calc/calc-loaddefs.el, subdirs.el are the same as
> > distributed, but loaddefs.el, cedet/ede/loaddefs.el,
> > cedet/semantic/loaddefs.el, cedet/srecode/loaddefs.el are not!
> >
> > What is triggering the differences, and where can they be found,
> > especially the large lisp/loaddefs.el debian/build-?/lisp/loaddefs.el?
>
> Since you didn't tell what are the differences that is hard to answer.
Thank you for your reply.
Makefile differences are:
diff -u ../emacs-23.4/Makefile ./debian/build-x/Makefile: Mainly doc
changes.
diff -u ../emacs-23.4/lisp/Makefile ./debian/build-x/lisp/Makefile:
almost the same:
-lisp=.../emacs-23.4/lisp
-VPATH=.../emacs-23.4/lisp
-srcdir=../emacs-23.4/lisp/..
+lisp=.../emacs23-23.4+1/debian/build-x/lisp
+VPATH=.../emacs23-23.4+1/debian/build-x/lisp
+srcdir=.../emacs23-23.4+1/debian/build-x/lisp/..
diff
-u ../emacs-23.4/lib-src/Makefile ./debian/build-x/lib-src/Makefile:
similar to the above
diff -u ../emacs-23.4/src/Makefile ./debian/build-x/src/Makefile: same
as above
Is cpp used to process the Makefiles, if so where to find it?
Another piece of information is that when replacing the dumped emacs
from Debian with the one from the tarball, build is OK! So it seem that
the differences are in temacs or the dumped emacs.
Next is the differing .el files from the Debian build:
diff -u lisp/loaddefs.el ./debian/build-x/lisp/loaddefs.el >
lisp_loaddefs.el.diff
diff -u
lisp/cedet/ede/loaddefs.el ./debian/build-x/lisp/cedet/ede/loaddefs.el >
lisp_cedet_ede_loaddefs.el.diff
diff -u ./debian/build-x/lisp/cedet/semantic/loaddefs.el
lisp/cedet/semantic/loaddefs.el > lisp_cedet_semantic_loaddefs.el.diff
diff -u
lisp/cedet/srecode/loaddefs.el ./debian/build-x/lisp/cedet/srecode/loaddefs.el > lisp_cedet_srecode_loaddefs.el.diff
Unfortunately, lisp_cedet_semantic_loaddefs.el.diff and
lisp_loaddefs.el.diff are 85k and 230k respectively, but I'm attaching
the other two.
Where does the additional code come from?
FYI: All these builds are done on Linux/i386 for speed reasons, but the
problems are the same. Difference is that the GNU/Hurd build hangs when
compiling lisp/cedet/srecode/mode.elc, and the linux build succeeeds.
Additionally, with the modified code the compile of the above emits:
Compiling /home/srs/hurd-installer/DEBs/linux_DEBs/emacs/emacs23-23.4
+1/debian/build-x/lisp/cedet/srecode/mode.el
Parsing *srecode-map-tmp* (LALR)...
Parsing *srecode-map-tmp* (LALR)...done
Parsing *srecode-map-tmp* (LALR)...
Parsing *srecode-map-tmp* (LALR)...done
Wrote /home/srs/hurd-installer/DEBs/linux_DEBs/emacs/emacs23-23.4
+1/debian/build-x/lisp/cedet/srecode/mode.elc
Without the *.el changes (tarball), the build does not show this.
[-- Attachment #2: lisp_cedet_ede_loaddefs.el.diff --]
[-- Type: text/x-patch, Size: 6263 bytes --]
--- lisp/cedet/ede/loaddefs.el 2012-03-21 02:36:45.000000000 +0100
+++ ./debian/build-x/lisp/cedet/ede/loaddefs.el 2012-06-29 09:29:35.162403478 +0200
@@ -3,6 +3,44 @@
;;; Code:
\f
+;;;### (autoloads (ede-project-sort-targets ede-customize-current-target
+;;;;;; ede-customize-project) "ede/custom" "custom.el" "09c17fa1f4ce8ff12980a92d0c7ad139")
+;;; Generated autoloads from custom.el
+
+(autoload 'ede-customize-project "ede/custom" "\
+Edit fields of the current project through EIEIO & Custom.
+
+\(fn)" t nil)
+
+(defalias 'customize-project 'ede-customize-project)
+
+(autoload 'ede-customize-current-target "ede/custom" "\
+Edit fields of the current target through EIEIO & Custom.
+
+\(fn)" t nil)
+
+(defalias 'customize-target 'ede-customize-current-target)
+
+(autoload 'ede-project-sort-targets "ede/custom" "\
+Create a custom-like buffer for sorting targets of current project.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-cpp-root-project-root) "ede/cpp-root" "cpp-root.el"
+;;;;;; "cccc19ac315b210a877e63224213ec5a")
+;;; Generated autoloads from cpp-root.el
+
+(autoload 'ede-cpp-root-project-root "ede/cpp-root" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "cpp-root" :name "CPP ROOT" :file 'ede/cpp-root :proj-file 'ede-cpp-root-project-file-for-dir :proj-root 'ede-cpp-root-project-root :load-type 'ede-cpp-root-load :class-sym 'ede-cpp-root :new-p nil) t)
+
+;;;***
+\f
;;;### (autoloads (ede-cpp-root-project-root) "ede/cpp-root" "cpp-root.el"
;;;;;; "eb28d139036d23e64ec50a69db215db4")
;;; Generated autoloads from cpp-root.el
@@ -126,6 +164,140 @@
;;; Generated autoloads from util.el
(autoload 'ede-update-version "ede/util" "\
+Update the current projects main version number.
+Argument NEWVERSION is the version number to use in the current project.
+
+\(fn NEWVERSION)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-emacs-project-root) "ede/emacs" "emacs.el"
+;;;;;; "adb8201f560ee7d5a2c91dad37717e38")
+;;; Generated autoloads from emacs.el
+
+(autoload 'ede-emacs-project-root "ede/emacs" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "emacs" :name "EMACS ROOT" :file 'ede/emacs :proj-file "src/emacs.c" :proj-root 'ede-emacs-project-root :load-type 'ede-emacs-load :class-sym 'ede-emacs-project :new-p nil) t)
+
+;;;***
+\f
+;;;### (autoloads (ede-find-file) "ede/files" "files.el" "c881bb08ad0f360c089958621581cad7")
+;;; Generated autoloads from files.el
+
+(autoload 'ede-find-file "ede/files" "\
+Find FILE in project. FILE can be specified without a directory.
+There is no completion at the prompt. FILE is searched for within
+the current EDE project.
+
+\(fn FILE)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-enable-generic-projects) "ede/generic" "generic.el"
+;;;;;; "c925a0078d64c9b980e64a15bb4435d4")
+;;; Generated autoloads from generic.el
+
+(autoload 'ede-enable-generic-projects "ede/generic" "\
+Enable generic project loaders.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-linux-project-root) "ede/linux" "linux.el"
+;;;;;; "c45128f8de7d43c8f62e7ebe92e6f9d7")
+;;; Generated autoloads from linux.el
+
+(autoload 'ede-linux-project-root "ede/linux" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "linux" :name "LINUX ROOT" :file 'ede/linux :proj-file "scripts/ver_linux" :proj-root 'ede-linux-project-root :load-type 'ede-linux-load :class-sym 'ede-linux-project :new-p nil) t)
+
+;;;***
+\f
+;;;### (autoloads (ede-enable-locate-on-project) "ede/locate" "locate.el"
+;;;;;; "bd045d711aa430a1c3505e8603d28ada")
+;;; Generated autoloads from locate.el
+
+(autoload 'ede-enable-locate-on-project "ede/locate" "\
+Enable an EDE locate feature on PROJECT.
+Attempt to guess which project locate style to use
+based on `ede-locate-setup-options'.
+
+\(fn &optional PROJECT)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-make-check-version) "ede/make" "make.el" "b32d0d6434750433585717ff3e92c0ef")
+;;; Generated autoloads from make.el
+
+(autoload 'ede-make-check-version "ede/make" "\
+Check the version of GNU Make installed.
+The check passes if the MAKE version is no high enough, or if it
+is not GNU make.
+If NOERROR is non-nil, return t for success, nil for failure.
+If NOERROR is nil, then throw an error on failure. Return t otherwise.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-speedbar-file-setup) "ede/speedbar" "speedbar.el"
+;;;;;; "2898e2a06e27d90b53f3ff9f91c18310")
+;;; Generated autoloads from speedbar.el
+
+(autoload 'ede-speedbar-file-setup "ede/speedbar" "\
+Setup some keybindings in the Speedbar File display.
+
+\(fn)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-vc-project-directory ede-upload-html-documentation
+;;;;;; ede-upload-distribution ede-edit-web-page ede-web-browse-home)
+;;;;;; "ede/system" "system.el" "527bedb469b979aecf41f710a0e118aa")
+;;; Generated autoloads from system.el
+
+(autoload 'ede-web-browse-home "ede/system" "\
+Browse the home page of the current project.
+
+\(fn)" t nil)
+
+(autoload 'ede-edit-web-page "ede/system" "\
+Edit the web site for this project.
+
+\(fn)" t nil)
+
+(autoload 'ede-upload-distribution "ede/system" "\
+Upload the current distribution to the correct location.
+Use /user@ftp.site.com: file names for FTP sites.
+Download tramp, and use /r:machine: for names on remote sites w/out FTP access.
+
+\(fn)" t nil)
+
+(autoload 'ede-upload-html-documentation "ede/system" "\
+Upload the current distributions documentation as HTML.
+Use /user@ftp.site.com: file names for FTP sites.
+Download tramp, and use /r:machine: for names on remote sites w/out FTP access.
+
+\(fn)" t nil)
+
+(autoload 'ede-vc-project-directory "ede/system" "\
+Run `vc-dir' on the current project.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (ede-update-version) "ede/util" "util.el" "c550f3b739ef7442c2ff1f44d498ed33")
+;;; Generated autoloads from util.el
+
+(autoload 'ede-update-version "ede/util" "\
Update the current projects main version number.
Argument NEWVERSION is the version number to use in the current project.
[-- Attachment #3: lisp_cedet_srecode_loaddefs.el.diff --]
[-- Type: text/x-patch, Size: 7721 bytes --]
--- lisp/cedet/srecode/loaddefs.el 2012-03-21 02:36:45.000000000 +0100
+++ ./debian/build-x/lisp/cedet/srecode/loaddefs.el 2012-06-29 09:29:35.106403475 +0200
@@ -4,6 +4,180 @@
\f
;;;### (autoloads (global-srecode-minor-mode srecode-minor-mode)
+;;;;;; "srecode/mode" "mode.el" "5028bf39d1ddf6b79c154a63b4861efa")
+;;; Generated autoloads from mode.el
+
+(autoload 'srecode-minor-mode "srecode/mode" "\
+Toggle srecode minor mode.
+With prefix argument ARG, turn on if positive, otherwise off. The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing. Return non-nil if the
+minor mode is enabled.
+
+\\{srecode-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-srecode-minor-mode "srecode/mode" "\
+Toggle global use of srecode minor mode.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-get-maps) "srecode/map" "map.el" "40efc9d34f118f06e9bc129343d31c93")
+;;; Generated autoloads from map.el
+
+(autoload 'srecode-get-maps "srecode/map" "\
+Get a list of maps relevant to the current buffer.
+Optional argument RESET forces a reset of the current map.
+
+\(fn &optional RESET)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-semantic-handle-:java) "srecode/java"
+;;;;;; "java.el" "35bd5d7e19840ea6cfe3593989f96cf3")
+;;; Generated autoloads from java.el
+
+(autoload 'srecode-semantic-handle-:java "srecode/java" "\
+Add macros into the dictionary DICT based on the current java file.
+Adds the following:
+FILENAME_AS_PACKAGE - file/dir converted into a java package name.
+FILENAME_AS_CLASS - file converted to a Java class name.
+
+\(fn DICT)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-insert) "srecode/insert" "insert.el" "c241cf2ab3b2a13cb3fc1f7238e4f3ef")
+;;; Generated autoloads from insert.el
+
+(autoload 'srecode-insert "srecode/insert" "\
+Insert the template TEMPLATE-NAME into the current buffer at point.
+DICT-ENTRIES are additional dictionary values to add.
+
+\(fn TEMPLATE-NAME &rest DICT-ENTRIES)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-insert-getset) "srecode/getset" "getset.el"
+;;;;;; "c48863f8bd674d410fe59377f0bff235")
+;;; Generated autoloads from getset.el
+
+(autoload 'srecode-insert-getset "srecode/getset" "\
+Insert get/set methods for the current class.
+CLASS-IN is the semantic tag of the class to update.
+FIELD-IN is the semantic tag, or string name, of the field to add.
+If you do not specify CLASS-IN or FIELD-IN then a class and field
+will be derived.
+
+\(fn &optional CLASS-IN FIELD-IN)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-insert-prototype-expansion) "srecode/expandproto"
+;;;;;; "expandproto.el" "e11609a8b748bd8218c5b0d69968e715")
+;;; Generated autoloads from expandproto.el
+
+(autoload 'srecode-insert-prototype-expansion "srecode/expandproto" "\
+Insert get/set methods for the current class.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-semantic-handle-:el-custom srecode-semantic-handle-:el)
+;;;;;; "srecode/el" "el.el" "8fca9dd41c8bd62644c77483a4d678f2")
+;;; Generated autoloads from el.el
+
+(autoload 'srecode-semantic-handle-:el "srecode/el" "\
+Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+ PRENAME - The common name prefix of this file.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:el-custom "srecode/el" "\
+Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+ GROUP - The 'defgroup' name we guess you want for variables.
+ FACEGROUP - The `defgroup' name you might want for faces.
+
+\(fn DICT)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-document-insert-group-comments srecode-document-insert-variable-one-line-comment
+;;;;;; srecode-document-insert-function-comment srecode-document-insert-comment)
+;;;;;; "srecode/document" "document.el" "2da17b960af17649c3b4aac714963c3d")
+;;; Generated autoloads from document.el
+
+(autoload 'srecode-document-insert-comment "srecode/document" "\
+Insert some comments.
+Whack any comments that may be in the way and replace them.
+If the region is active, then insert group function comments.
+If the cursor is in a comment, figure out what kind of comment it is
+ and replace it.
+If the cursor is in a function, insert a function comment.
+If the cursor is on a one line prototype, then insert post-fcn comments.
+
+\(fn)" t nil)
+
+(autoload 'srecode-document-insert-function-comment "srecode/document" "\
+Insert or replace a function comment.
+FCN-IN is the Semantic tag of the function to add a comment too.
+If FCN-IN is not provided, the current tag is used instead.
+It is assumed that the comment occurs just in front of FCN-IN.
+
+\(fn &optional FCN-IN)" t nil)
+
+(autoload 'srecode-document-insert-variable-one-line-comment "srecode/document" "\
+Insert or replace a variable comment.
+VAR-IN is the Semantic tag of the function to add a comment too.
+If VAR-IN is not provided, the current tag is used instead.
+It is assumed that the comment occurs just after VAR-IN.
+
+\(fn &optional VAR-IN)" t nil)
+
+(autoload 'srecode-document-insert-group-comments "srecode/document" "\
+Insert group comments around the active between BEG and END.
+If the region includes only parts of some tags, expand out
+to the beginning and end of the tags on the region.
+If there is only one tag in the region, complain.
+
+\(fn BEG END)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-semantic-handle-:cpp) "srecode/cpp" "cpp.el"
+;;;;;; "a3509d9d09b963acf354d8380fe1c3a5")
+;;; Generated autoloads from cpp.el
+
+(autoload 'srecode-semantic-handle-:cpp "srecode/cpp" "\
+Add macros into the dictionary DICT based on the current c++ file.
+Adds the following:
+FILENAME_SYMBOL - filename converted into a C compat symbol.
+HEADER - Shown section if in a header file.
+
+\(fn DICT)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-compile-templates) "srecode/compile" "compile.el"
+;;;;;; "27edfed66b3ff599a4f36fb78399004f")
+;;; Generated autoloads from compile.el
+
+(autoload 'srecode-compile-templates "srecode/compile" "\
+Compile a semantic recode template file into a mode-local variable.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads (global-srecode-minor-mode srecode-minor-mode)
;;;;;; "srecode/mode" "mode.el" "df9f82f67270768d28d5af006487fe3f")
;;; Generated autoloads from mode.el
@@ -193,6 +367,38 @@
;;; Generated autoloads from texi.el
(autoload 'srecode-semantic-handle-:texi "srecode/texi" "\
+Add macros into the dictionary DICT based on the current texinfo file.
+Adds the following:
+ LEVEL - chapter, section, subsection, etc
+ NEXTLEVEL - One below level
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:texitag "srecode/texi" "\
+Add macros into the dictionary DICT based on the current :tag file.
+Adds the following:
+ TAGDOC - Texinfo formatted doc string for :tag.
+
+\(fn DICT)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-template-setup-parser) "srecode/template"
+;;;;;; "template.el" "109f17a60e8323c7cd19a115048f7585")
+;;; Generated autoloads from template.el
+
+(autoload 'srecode-template-setup-parser "srecode/template" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+;;;***
+\f
+;;;### (autoloads (srecode-semantic-handle-:texitag srecode-semantic-handle-:texi)
+;;;;;; "srecode/texi" "texi.el" "156f5f15a951a79376564dffe1227b58")
+;;; Generated autoloads from texi.el
+
+(autoload 'srecode-semantic-handle-:texi "srecode/texi" "\
Add macros into the dictionary DICT based on the current texinfo file.
Adds the following:
LEVEL - chapter, section, subsection, etc
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Need help with upstream vs Debian emacs-23.4 build differences
2012-06-29 6:49 ` Andreas Schwab
2012-06-29 8:01 ` Svante Signell
@ 2012-07-01 20:58 ` Svante Signell
1 sibling, 0 replies; 4+ messages in thread
From: Svante Signell @ 2012-07-01 20:58 UTC (permalink / raw)
To: Andreas Schwab; +Cc: help-gnu-emacs, emacs-devel
On Fri, 2012-06-29 at 08:49 +0200, Andreas Schwab wrote:
> Svante Signell <svante.signell@telia.com> writes:
>
> > eshell/esh-groups.el, calc/calc-loaddefs.el, subdirs.el are the same as
> > distributed, but loaddefs.el, cedet/ede/loaddefs.el,
> > cedet/semantic/loaddefs.el, cedet/srecode/loaddefs.el are not!
> >
> > What is triggering the differences, and where can they be found,
> > especially the large lisp/loaddefs.el debian/build-?/lisp/loaddefs.el?
>
> Since you didn't tell what are the differences that is hard to answer.
Hi, Did you receive my updated mail? I'm kind of stuck and would really
appreciate some kind of idea on how to debug further. Why is this
autoloads target creating so different results from the tarball build
and the Debian build?
^ permalink raw reply [flat|nested] 4+ messages in thread