[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-239-g21a7ba9

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=21a7ba9b7e7e97854678677c7da4b42bd9faec66

The branch, stable-2.0 has been updated
       via  21a7ba9b7e7e97854678677c7da4b42bd9faec66 (commit)
       via  de32a951c07243a307233ae2f2b478e636276e1e (commit)
       via  8cb0d6d7fa9aaac316c29a64c541336b51b6f93d (commit)
      from  da7e43a6e0dadb2f96e6e33163bb4d94715f7498 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21a7ba9b7e7e97854678677c7da4b42bd9faec66
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 12 15:56:11 2014 +0100

    build: Remove libguile-2.0-gdb.scm and $infodir/dir upon uninstall.
    
    * libguile/Makefile.am (uninstall-data-hook): New target.

commit de32a951c07243a307233ae2f2b478e636276e1e
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 12 15:18:27 2014 +0100

    build: Install libguile-2.0-gdb.scm after libguile-2.0.so.
    
    * libguile/Makefile.am (install-data-local): Rename to...
      (install-data-hook): ... this.  This guarantees that the rule runs
      after libguile-2.0.so has been installed.

commit 8cb0d6d7fa9aaac316c29a64c541336b51b6f93d
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 12 14:35:07 2014 +0100

    build: Don't include <config.h> in native programs when cross-compiling.
    
    * libguile/Makefile.am (gen-scmconfig.$(OBJEXT)): When cross-compiling,
      pass -DCROSS_COMPILING=1.
      (c-tokenize.$(OBJEXT)): Likewise.
    * libguile/c-tokenize.lex (%top): Include <config.h> only when
      CROSS_COMPILING is undefined.
    * libguile/gen-scmconfig.c: Likewise.

-----------------------------------------------------------------------

Summary of changes:
 libguile/Makefile.am     |   32 ++++++++++++++++++++------------
 libguile/c-tokenize.lex  |    9 +++++++--
 libguile/gen-scmconfig.c |    8 +++++---
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 6a631d8..dd6d662 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -60,12 +60,13 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
 ## the generated config.h and gen-scmconfig.h.  Nothing else from Guile
 ## is included by this code generator.
 gen-scmconfig.$(OBJEXT): gen-scmconfig.c
-       $(AM_V_GEN) \
-       if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
-                  -c -o $@ $<; \
-       else \
-               $(COMPILE) -c -o $@ $<; \
+       $(AM_V_GEN)                                             \
+       if [ "$(cross_compiling)" = "yes" ]; then               \
+               $(CC_FOR_BUILD) -DCROSS_COMPILING=1 $(DEFS)     \
+                  $(DEFAULT_INCLUDES) -I$(top_builddir)        \
+                  -c -o "$@" "$<";                             \
+       else                                                    \
+               $(COMPILE) -c -o "$@" "$<";                     \
        fi
 
 ## Override default rule; this should run on BUILD host.
@@ -92,11 +93,12 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c
 ## Override default rule; this should be compiled for BUILD host.
 ## For some reason, OBJEXT does not include the dot
 c-tokenize.$(OBJEXT): c-tokenize.c
-       $(AM_V_GEN) \
-       if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) -I$(top_builddir) -c -o $@ $<; \
-       else \
-               $(COMPILE) -c -o $@ $<; \
+       $(AM_V_GEN)                                                     \
+       if [ "$(cross_compiling)" = "yes" ]; then                       \
+               $(CC_FOR_BUILD) -DCROSS_COMPILING=1 -I$(top_builddir)   \
+                  -c -o "$@" "$<";                                     \
+       else                                                            \
+               $(COMPILE) -c -o "$@" "$<";                             \
        fi
 
 ## Override default rule; this should run on BUILD host.
@@ -448,7 +450,7 @@ address@hidden@_la_SOURCES = _scm.h         \
 install-exec-hook:
        rm -f $(DESTDIR)$(bindir)/guile-snarf.awk
 
-install-data-local: libguile-2.0-gdb.scm
+install-data-hook: libguile-2.0-gdb.scm
        @$(MKDIR_P) $(DESTDIR)$(libdir)
 ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm.
 ## SOMETHING is the full name of the final library.  We want to ignore
@@ -473,6 +475,12 @@ $(DESTDIR)$(libdir)/$$libname-gdb.scm";                    
        \
        $(INSTALL_DATA) "$<"                                    \
            "$(DESTDIR)$(libdir)/$$libname-gdb.scm"
 
+# Remove the GDB support file and the Info 'dir' file that
+# 'install-info' 5.x installs.
+uninstall-hook:
+       -rm "$(DESTDIR)$(libdir)/address@hidden@"*-gdb.scm
+       -rm -f "$(DESTDIR)$(infodir)/dir"
+
 ## This is kind of nasty... there are ".c" files that we don't want to
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
diff --git a/libguile/c-tokenize.lex b/libguile/c-tokenize.lex
index a64b61d..03fe989 100644
--- a/libguile/c-tokenize.lex
+++ b/libguile/c-tokenize.lex
@@ -1,7 +1,12 @@
 %top{
 /* Include <config.h> before anything else because Gnulib headers such
-   as <stdio.h> rely on it.  */
-#include <config.h>
+   as <stdio.h> rely on it.
+
+   However, when cross-compiling, don't include <config.h> because it
+   contains information about the host, not about the build.  */
+#ifndef CROSS_COMPILING
+# include <config.h>
+#endif
 }
 
 %option noyywrap
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index 2f6fa6e..3c8be4f 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -132,8 +132,10 @@
 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
+/* Don't include <config.h> when cross-compiling because it contains
+   information about the host, not about the build machine.  */
+#ifndef CROSS_COMPILING
+# include <config.h>
 #endif
 
 #include <libguile/gen-scmconfig.h>


hooks/post-receive
-- 
GNU Guile