mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00
Code Activity

autocompiled files before installation go to a cache dir in the builddir

Browse source 
* libguile/load.c (scm_init_load_path): Append a slash after
  XDG_CACHE_HOME.

* meta/gdb-uninstalled-guile.in:
* meta/guile.in (XDG_CACHE_HOME): Export this var so we write to a cache
  within the build directory. Probably we should have a GUILE_CACHE_DIR
  to be more specific, though.

* Makefile.am (clean-local): Clear the cache when making clean.
This commit is contained in:
Andy Wingo 2009-08-20 17:56:44 +02:00
parent 53a468dd8c
commit 48a0fe4d6b
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -42,6 +42,9 @@ DISTCLEANFILES = check-guile.log
dist-hook: gen-ChangeLog dist-hook: gen-ChangeLog
clean-local:
rm -rf cache/
gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b
.PHONY: gen-ChangeLog .PHONY: gen-ChangeLog
gen-ChangeLog: gen-ChangeLog:

2
libguile/load.c
View file

@ -257,7 +257,7 @@ scm_init_load_path ()
"guile/ccache/" SCM_EFFECTIVE_VERSION "-" SCM_OBJCODE_MACHINE_VERSION_STRING "guile/ccache/" SCM_EFFECTIVE_VERSION "-" SCM_OBJCODE_MACHINE_VERSION_STRING
if ((e = getenv ("XDG_CACHE_HOME"))) if ((e = getenv ("XDG_CACHE_HOME")))
snprintf (cachedir, sizeof(cachedir), "%s" FALLBACK_DIR, e); snprintf (cachedir, sizeof(cachedir), "%s/" FALLBACK_DIR, e);
else if ((e = getenv ("HOME"))) else if ((e = getenv ("HOME")))
snprintf (cachedir, sizeof(cachedir), "%s/.cache/" FALLBACK_DIR, e); snprintf (cachedir, sizeof(cachedir), "%s/.cache/" FALLBACK_DIR, e);
#ifdef HAVE_GETPWENT #ifdef HAVE_GETPWENT

4
meta/gdb-uninstalled-guile.in
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2002, 2006, 2008 Free Software Foundation # Copyright (C) 2002, 2006, 2008, 2009 Free Software Foundation
# #
# This file is part of GUILE. # This file is part of GUILE.
# #
@ -34,5 +34,7 @@
set -e set -e
# env (set by configure) # env (set by configure)
top_builddir="@top_builddir_absolute@" top_builddir="@top_builddir_absolute@"
XDG_CACHE_HOME=${top_builddir}/cache
export XDG_CACHE_HOME
exec ${top_builddir}/meta/uninstalled-env libtool --mode=execute \ exec ${top_builddir}/meta/uninstalled-env libtool --mode=execute \
gdb --args ${top_builddir}/libguile/guile "$@" gdb --args ${top_builddir}/libguile/guile "$@"

4
meta/guile.in
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2002, 2006, 2008 Free Software Foundation # Copyright (C) 2002, 2006, 2008, 2009 Free Software Foundation
# #
# This file is part of GUILE. # This file is part of GUILE.
# #
@ -41,6 +41,8 @@ top_builddir="@top_builddir_absolute@"
# set GUILE (clobber) # set GUILE (clobber)
GUILE=${top_builddir}/libguile/guile GUILE=${top_builddir}/libguile/guile
export GUILE export GUILE
XDG_CACHE_HOME=${top_builddir}/cache
export XDG_CACHE_HOME
# do it # do it
exec ${top_builddir}/meta/uninstalled-env $GUILE "$@" exec ${top_builddir}/meta/uninstalled-env $GUILE "$@"