[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-34-gf701287

[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=f701287497d545061009ad572c69f86bb10d7a6a

The branch, stable-2.0 has been updated
       via  f701287497d545061009ad572c69f86bb10d7a6a (commit)
      from  9447207f0c9a52d48b2de20b444405dfdd43d465 (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 f701287497d545061009ad572c69f86bb10d7a6a
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 23 15:29:18 2011 +0100

    Allow $GUILE_FOR_BUILD to use its own environment when cross-compiling.
    
    * am/guilec (.scm.go): Use `-L' to specify the search path.
    * module/Makefile.am (ice-9/psyntax-pp.go): Likewise.
    
    * meta/uninstalled-env.in (top_builddir): Leave $GUILE_LOAD_PATH,
      $GUILE_SYSTEM_PATH, and $GUILE_SYSTEM_EXTENSIONS_PATH unchanged when
      cross-compiling.

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

Summary of changes:
 am/guilec               |    7 +++-
 meta/uninstalled-env.in |   87 +++++++++++++++++++++++++----------------------
 module/Makefile.am      |    5 ++-
 3 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/am/guilec b/am/guilec
index 9af9daf..7634a97 100644
--- a/am/guilec
+++ b/am/guilec
@@ -26,6 +26,9 @@ AM_V_GUILEC_0 = @echo "  GUILEC" $@;
 
 SUFFIXES = .scm .go
 .scm.go:
-       $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0                              \
+       $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0                      \
        $(top_builddir)/meta/uninstalled-env                    \
-       guild compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"
+       guild compile --target="$(host)" $(GUILE_WARNINGS)      \
+         -L "$(abs_srcdir)" -L "$(abs_builddir)"               \
+         -L "$(abs_top_srcdir)/guile-readline"                 \
+         -o "$@" "$<"
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 24a05f9..5fa0db0 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -46,35 +46,40 @@ top_builddir="@top_builddir_absolute@"
     exit 1
 }
 
-if [ x"$GUILE_LOAD_PATH" = x ]
-then
-    
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline:${top_srcdir}"
-    if test "${top_srcdir}" != "${top_builddir}"; then
-        
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
-    fi
-else
-  for d in "/module" "/guile-readline" ""
-  do
-    # This hair prevents double inclusion.
-    # The ":" prevents prefix aliasing.
-    case x"$GUILE_LOAD_PATH" in
-      x*${top_srcdir}${d}:*) ;;
-      x*${top_srcdir}${d}) ;;
-      *) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
-    esac
-    case x"$GUILE_LOAD_PATH" in
-      x*${top_builddir}${d}:*) ;;
-      x*${top_builddir}${d}) ;;
-      *) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
-    esac
-  done
-fi
-export GUILE_LOAD_PATH
-
 # When cross-compiling, let $GUILE_FOR_BUILD use its own .go files since
-# the ones that are being built may be incompatible.
+# the ones that are being built may be incompatible ($GUILE_FOR_BUILD is
+# typically used to run `guild compile --target=$host'.)  Likewise,
+# $GUILE_FOR_BUILD must use its own source files when booting; for
+# instance, $srcdir/module/ice-9/boot-9.scm must not be in its search
+# path, because it would then end up using its C evaluator to run the
+# compiler.
 if test "@cross_compiling@" = "no"
 then
+    if [ x"$GUILE_LOAD_PATH" = x ]
+    then
+       
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline:${top_srcdir}"
+       if test "${top_srcdir}" != "${top_builddir}"; then
+            
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
+       fi
+    else
+       for d in "/module" "/guile-readline" ""
+       do
+            # This hair prevents double inclusion.
+            # The ":" prevents prefix aliasing.
+           case x"$GUILE_LOAD_PATH" in
+               x*${top_srcdir}${d}:*) ;;
+               x*${top_srcdir}${d}) ;;
+               *) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
+           esac
+           case x"$GUILE_LOAD_PATH" in
+               x*${top_builddir}${d}:*) ;;
+               x*${top_builddir}${d}) ;;
+               *) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
+           esac
+       done
+    fi
+    export GUILE_LOAD_PATH
+
     if test "x$GUILE_LOAD_COMPILED_PATH" = "x"
     then
        
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
@@ -91,22 +96,22 @@ then
        done
     fi
     export GUILE_LOAD_COMPILED_PATH
-fi
 
-# Don't look in installed dirs for guile modules
-if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then
-  GUILE_SYSTEM_PATH=
-  export GUILE_SYSTEM_PATH
-fi
-# Don't look in installed dirs for compiled guile modules
-if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
-  GUILE_SYSTEM_COMPILED_PATH=
-  export GUILE_SYSTEM_COMPILED_PATH
-fi
-# Don't look in installed dirs for dlopen-able modules
-if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > /dev/null ); then
-  GUILE_SYSTEM_EXTENSIONS_PATH=
-  export GUILE_SYSTEM_EXTENSIONS_PATH
+    # Don't look in installed dirs for guile modules
+    if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then
+       GUILE_SYSTEM_PATH=
+       export GUILE_SYSTEM_PATH
+    fi
+    # Don't look in installed dirs for compiled guile modules
+    if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
+       GUILE_SYSTEM_COMPILED_PATH=
+       export GUILE_SYSTEM_COMPILED_PATH
+    fi
+    # Don't look in installed dirs for dlopen-able modules
+    if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > /dev/null ); then
+       GUILE_SYSTEM_EXTENSIONS_PATH=
+       export GUILE_SYSTEM_EXTENSIONS_PATH
+    fi
 fi
 
 # handle LTDL_LIBRARY_PATH (no clobber)
diff --git a/module/Makefile.am b/module/Makefile.am
index 2c5e259..56fa48d 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -79,10 +79,13 @@ ice-9/psyntax-pp.scm.gen:
 
 .PHONY: ice-9/psyntax-pp.scm.gen
 
+# Keep this rule in sync with that in `am/guilec'.
 ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm
-       $(AM_V_GUILEC) GUILE_AUTO_COMPILE=0                             \
+       $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0                              \
        $(top_builddir)/meta/uninstalled-env                            \
        guild compile --target="$(host)" $(GUILE_WARNINGS)              \
+         -L "$(abs_srcdir)" -L "$(abs_builddir)"                       \
+         -L "$(abs_top_srcdir)/guile-readline"                         \
          -o "ice-9/psyntax-pp.go" "$(srcdir)/ice-9/psyntax.scm"
 
 SCHEME_LANG_SOURCES =                                          \


hooks/post-receive
-- 
GNU Guile