[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115997: Revert part of revision 115992 and fix the
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115997: Revert part of revision 115992 and fix the VCSWITNESS thingy. |
Date: |
Sun, 12 Jan 2014 17:28:22 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115997
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-12 19:27:17 +0200
message:
Revert part of revision 115992 and fix the VCSWITNESS thingy.
Makefile.in (src): Fix the computation of $vcswitness.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
etc/PROBLEMS problems-20091113204419-o5vbwnq5f7feedwu-1498
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-12 16:37:42 +0000
+++ b/ChangeLog 2014-01-12 17:27:17 +0000
@@ -1,7 +1,6 @@
-2014-01-12 Eric S. Raymond <address@hidden>
+2014-01-12 Eli Zaretskii <address@hidden>
- * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS
- code, and explain the problem.
+ * Makefile.in (src): Fix the computation of $vcswitness.
2014-01-12 Glenn Morris <address@hidden>
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-01-12 14:54:50 +0000
+++ b/Makefile.in 2014-01-12 17:27:17 +0000
@@ -374,12 +374,16 @@
# all preloaded elisp files, and only then dump the actual src/emacs, which
# is not wrong, but is overkill in 99.99% of the cases.
src: Makefile FRC
+ dirstate='.bzr/checkout/dirstate'; \
+ vcswitness='$(srcdir)/../'$$dirstate; \
+ [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \
cd $@ || exit; \
boot=bootstrap-emacs$(EXEEXT); \
[ ! -x "$$boot" ] || boot=''; \
$(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
- LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"
+ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
+ VCSWITNESS="$$vcswitness"
blessmail: Makefile src FRC
cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS 2014-01-12 14:54:50 +0000
+++ b/etc/PROBLEMS 2014-01-12 17:27:17 +0000
@@ -2429,12 +2429,6 @@
from source, rather than the Ubuntu version, worked.
See <URL:http://debbugs.gnu.org/327, <URL:http://debbugs.gnu.org/821>.
-*** Rebuild of loaddefs.el is not always done after Lisp changes
-
-The rebuild production should depend on all Lisp files with #autoload
-cookies. It doesn't yet. This needs a configure-time improvement to
-the nuild system.
-
** Dumping
*** Linux: Segfault during `make bootstrap' under certain recent versions of
the Linux kernel.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2014-01-12 14:54:50 +0000
+++ b/src/Makefile.in 2014-01-12 17:27:17 +0000
@@ -629,10 +629,12 @@
## Since the .el.elc rule cannot specify an extra dependency, we do it here.
$(lisp): $(BOOTSTRAPEMACS)
-## This ought to depend on every Lisp file that contains an autoload cookie.
-## A task for the future...
+## VCSWITNESS points to the file that holds info about the current checkout.
+## We use it as a heuristic to decide when to rebuild loaddefs.el.
+## If empty it is ignored; the parent makefile can set it to some other value.
+VCSWITNESS =
-$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS)
+$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)"
## Dump an Emacs executable named bootstrap-emacs containing the
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115997: Revert part of revision 115992 and fix the VCSWITNESS thingy.,
Eli Zaretskii <=