[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: Add meta/build-env
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] 01/01: Add meta/build-env |
|
Date: |
Sun, 10 Jul 2016 12:23:08 +0000 (UTC) |
wingo pushed a commit to branch master
in repository guile.
commit 38f23e75a5508bc6c1016f1809dc522e36ccd08b
Author: Andy Wingo <address@hidden>
Date: Sun Jul 10 13:21:38 2016 +0200
Add meta/build-env
* meta/build-env.in: New file which sets up an environment that does not
inherit GUILE_LOAD_PATH / GUILE_LOAD_COMPILED_PATH (unless
cross-compiling).
* doc/ref/Makefile.am (autoconf-macros.texi):
* libguile/Makefile.am (snarf2checkedtexi):
* module/Makefile.am (ice-9/psyntax-pp.go):
* test-suite/standalone/Makefile.am (GUILE_INSTALL_LOCALE):
* am/bootstrap.am (.scm.go):
* am/guilec (.scm.go): Use build-env.
* configure.ac: Create build-env.
---
am/bootstrap.am | 2 +-
am/guilec | 4 +-
configure.ac | 1 +
doc/ref/Makefile.am | 2 +-
libguile/Makefile.am | 2 +-
meta/build-env.in | 121 +++++++++++++++++++++++++++++++++++++
module/Makefile.am | 2 +-
test-suite/standalone/Makefile.am | 2 +-
8 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/am/bootstrap.am b/am/bootstrap.am
index 0eaa87b..d5f25ab 100644
--- a/am/bootstrap.am
+++ b/am/bootstrap.am
@@ -41,7 +41,7 @@ SUFFIXES = .scm .go
.scm.go:
$(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \
- $(top_builddir)/meta/uninstalled-env \
+ $(top_builddir)/meta/build-env \
guild compile --target="$(GUILE_TARGET)" \
$(GUILE_WARNINGS) $(GUILE_OPTIMIZATIONS) \
-L "$(abs_top_srcdir)/module" \
diff --git a/am/guilec b/am/guilec
index 7ab9ccc..fa2054e 100644
--- a/am/guilec
+++ b/am/guilec
@@ -28,7 +28,7 @@ SUFFIXES = .scm .el .go
.scm.go:
$(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \
- $(top_builddir)/meta/uninstalled-env \
+ $(top_builddir)/meta/build-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \
-L "$(abs_top_srcdir)/guile-readline" \
@@ -36,7 +36,7 @@ SUFFIXES = .scm .el .go
.el.go:
$(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \
- $(top_builddir)/meta/uninstalled-env \
+ $(top_builddir)/meta/build-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \
-L "$(abs_top_srcdir)/guile-readline" \
diff --git a/configure.ac b/configure.ac
index 4c78b07..1735c56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1663,6 +1663,7 @@ AC_CONFIG_FILES([
GUILE_CONFIG_SCRIPT([check-guile])
GUILE_CONFIG_SCRIPT([benchmark-guile])
GUILE_CONFIG_SCRIPT([meta/guile])
+GUILE_CONFIG_SCRIPT([meta/build-env])
GUILE_CONFIG_SCRIPT([meta/uninstalled-env])
GUILE_CONFIG_SCRIPT([meta/gdb-uninstalled-guile])
GUILE_CONFIG_SCRIPT([libguile/guile-snarf])
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 83c6e5e..ada4f36 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -120,7 +120,7 @@ EXTRA_DIST = ChangeLog-2008 $(PICTURES)
libguile-autoconf.texi: autoconf-macros.texi
autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
- GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild \
+ GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/build-env guild \
snarf-guile-m4-docs $(top_srcdir)/meta/guile.m4 \
> $(srcdir)/$@
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 909101c..855a57f 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -762,7 +762,7 @@ load.x: libpath.h
dynl.x: libpath.h
alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env
guild snarf-check-and-output-texi
+snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/build-env guild
snarf-check-and-output-texi
dotdoc2texi = cat $(alldotdocfiles) | $(snarf2checkedtexi)
guile.texi: $(alldotdocfiles) guile$(EXEEXT)
diff --git a/meta/build-env.in b/meta/build-env.in
new file mode 100644
index 0000000..7a5bf33
--- /dev/null
+++ b/meta/build-env.in
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Copyright (C) 2003, 2006, 2008-2012, 2016 Free Software Foundation
+#
+# This file is part of GNU Guile.
+#
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+# Usage: build-env [ARGS]
+
+# This script arranges for the environment to support running Guile from
+# the build tree. Unlike uninstalled-env, we clobber the environment so
+# as to avoid inheriting environment variables that could make Guile
+# load .scm, .go, or .so files from installed directories.
+
+# Example: build-env guile -c '(display "hello\n")'
+# Example: ../../build-env ./guile-test-foo
+
+top_srcdir="@top_srcdir_absolute@"
+top_builddir="@top_builddir_absolute@"
+
+[ x"$top_srcdir" = x -o ! -d "$top_srcdir" -o \
+ x"$top_builddir" = x -o ! -d "$top_builddir" ] && {
+ echo $0: bad environment
+ echo top_srcdir=$top_srcdir
+ echo top_builddir=$top_builddir
+ exit 1
+}
+
+# When cross-compiling, let $GUILE_FOR_BUILD use its own .go files since
+# 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
+ GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline"
+ if test "${top_srcdir}" != "${top_builddir}"; then
+
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline"
+ fi
+ export GUILE_LOAD_PATH
+
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/bootstrap:${top_builddir}/prebuilt/@host@:${top_builddir}/guile-readline"
+ export GUILE_LOAD_COMPILED_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)
+for dir in guile-readline libguile ; do
+ if test -z "$LTDL_LIBRARY_PATH"; then
+ LTDL_LIBRARY_PATH="${top_builddir}/${dir}"
+ else
+ LTDL_LIBRARY_PATH="${top_builddir}/${dir}:${LTDL_LIBRARY_PATH}"
+ fi
+ if test -z "$DYLD_LIBRARY_PATH"; then
+ DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs"
+ else
+ DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs:${DYLD_LIBRARY_PATH}"
+ fi
+done
+export LTDL_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+if [ x"$PKG_CONFIG_PATH" = x ]
+then
+ PKG_CONFIG_PATH="${top_builddir}/meta"
+else
+ PKG_CONFIG_PATH="${top_builddir}/meta:$PKG_CONFIG_PATH"
+fi
+export PKG_CONFIG_PATH
+
+# handle PATH (no clobber)
+PATH="${top_builddir}/libguile:${PATH}"
+PATH="${top_srcdir}/meta:${PATH}"
+if test "x${top_srcdir}" != "x${top_builddir}"; then
+ PATH="${top_builddir}/meta:${PATH}"
+fi
+export PATH
+
+# Define $GUILE, used by `guild'.
+if test "@cross_compiling@" = "no"
+then
+ GUILE=${top_builddir}/libguile/address@hidden@
+else
+ GUILE="@GUILE_FOR_BUILD@"
+fi
+export GUILE
+
+XDG_CACHE_HOME=${top_builddir}/cache
+export XDG_CACHE_HOME
+
+exec "$@"
diff --git a/module/Makefile.am b/module/Makefile.am
index 3f14ed8..f590fb9 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -36,7 +36,7 @@ $(nobase_ccache_DATA): ../bootstrap/ice-9/eval.go
# 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 \
- $(top_builddir)/meta/uninstalled-env \
+ $(top_builddir)/meta/build-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \
-L "$(abs_top_srcdir)/guile-readline" \
diff --git a/test-suite/standalone/Makefile.am
b/test-suite/standalone/Makefile.am
index 524a144..2aba708 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -35,7 +35,7 @@ TESTS_ENVIRONMENT =
\
srcdir="$(srcdir)" \
builddir="$(builddir)" \
@LOCALCHARSET_TESTS_ENVIRONMENT@ \
- GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
+ GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/build-env"
## Check for headers in $(srcdir) and build dir before $(CPPFLAGS), which
## may point us to an old, installed version of guile.