[Emacs-diffs] trunk r117121: Port ctags+etags build to Sun C 5.12.

[Paul Eggert]

------------------------------------------------------------
revno: 117121
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-05-18 11:57:04 -0700
message:
  Port ctags+etags build to Sun C 5.12.
  
  * .bzrignore: Remove lib-src/ctags.c.
  * lib-src/Makefile.in (etags_args): Remove, replacing with ...
  (etags_cflags, etags_libs): New macros.  All uses changed.
  (ctags${EXEEXT}): Don't compile etags.c, as compiling etags.c in
  parallel (once for ctags, once for etags) breaks parallel makes
  with compilers that use the source file name to name temporaries,
  such as Sun C 5.12.  Instead, compile ctags.c.
  * lib-src/ctags.c: New file.
added:
  lib-src/ctags.c                ctags.c-20140518185427-z7ly6urgfpstd3o5-1
modified:
  .bzrignore                     bzrignore-20091227212532-2lrlpwjsfm9i221p-1
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/Makefile.in            makefile.in-20091113204419-o5vbwnq5f7feedwu-475

=== modified file '.bzrignore'
--- a/.bzrignore        2014-05-02 17:49:17 +0000
+++ b/.bzrignore        2014-05-18 18:57:04 +0000
@@ -134,7 +134,6 @@
 lib/cxxdefs.h
 lib-src/blessmail
 lib-src/ctags
-lib-src/ctags.c
 lib-src/ebrowse
 lib-src/emacsclient
 lib-src/etags

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-18 05:50:17 +0000
+++ b/ChangeLog 2014-05-18 18:57:04 +0000
@@ -1,5 +1,8 @@
 2014-05-18  Paul Eggert  <address@hidden>
 
+       Port ctags+etags build to Sun C 5.12.
+       * .bzrignore: Remove lib-src/ctags.c.
+
        Port recent libpng changes to hosts with missing png.h.
        * configure.ac (HAVE_PNG): Port to platforms where libpng-config
        succeeds but png.h is absent, by testing libpng-config's output

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-05-08 03:41:21 +0000
+++ b/lib-src/ChangeLog 2014-05-18 18:57:04 +0000
@@ -1,3 +1,14 @@
+2014-05-18  Paul Eggert  <address@hidden>
+
+       Port ctags+etags build to Sun C 5.12.
+       * Makefile.in (etags_args): Remove, replacing with ...
+       (etags_cflags, etags_libs): New macros.  All uses changed.
+       (ctags${EXEEXT}): Don't compile etags.c, as compiling etags.c in
+       parallel (once for ctags, once for etags) breaks parallel makes
+       with compilers that use the source file name to name temporaries,
+       such as Sun C 5.12.  Instead, compile ctags.c.
+       * ctags.c: New file.
+
 2014-05-04  Paul Eggert  <address@hidden>
 
        Handle systems without WCONTINUED consistently.  (Bug#15110, 17339)

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2014-04-30 19:54:52 +0000
+++ b/lib-src/Makefile.in       2014-05-18 18:57:04 +0000
@@ -311,18 +311,18 @@
 
 
 etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
-etags_args = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" \
-       ${srcdir}/etags.c regex.o $(LOADLIBES) $(NTLIB) -o $@
+etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
+etags_libs = regex.o $(LOADLIBES) $(NTLIB)
 
 etags${EXEEXT}: ${etags_deps}
-       $(CC) ${ALL_CFLAGS} ${etags_args}
+       $(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/etags.c $(etags_libs)
 
+## ctags.c is distinct from etags.c so that parallel makes do not write two
+## etags.o files on top of each other.
 ## FIXME?
-## Can't we use a symlink ctags -> etags, and make etags check for argv[0]?
-## Or a wrapper script that calls etags --ctags?
-ctags${EXEEXT}: ${etags_deps}
-       $(CC) ${ALL_CFLAGS} -DCTAGS ${etags_args}
-
+## Can't we use a wrapper that calls 'etags --ctags'?
+ctags${EXEEXT}: ctags.c ${etags_deps}
+       $(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/ctags.c $(etags_libs)
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
                    $(config_h)

=== added file 'lib-src/ctags.c'
--- a/lib-src/ctags.c   1970-01-01 00:00:00 +0000
+++ b/lib-src/ctags.c   2014-05-18 18:57:04 +0000
@@ -0,0 +1,2 @@
+#define CTAGS 1
+#include "etags.c"