This patch changes Guile to use a default search path relative to the location of the `guile' binary, allowing it to be relocated. --- a/libguile/load.c +++ b/libguile/load.c @@ -26,6 +26,7 @@ #include #include +#include #include "libguile/_scm.h" #include "libguile/alist.h" @@ -325,6 +326,32 @@ SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR + char *program, *bin_dir, *prefix, *module_dir, *ccache_dir; + + /* Determine the source and compiled module directories at run-time, + relative to the executable's location. + + Note: Use /proc/self/exe instead of argv[0] because the latter is + not necessarily an absolute, nor a valid file name. */ + + program = scm_gc_malloc_pointerless (256, "string"); + readlink ("/proc/self/exe", program, 256); + + bin_dir = dirname (strdupa (program)); + + prefix = scm_gc_malloc_pointerless (strlen (bin_dir) + 4, "string"); + strcpy (prefix, bin_dir); + strcat (prefix, "/.."); + prefix = canonicalize_file_name (prefix); + + module_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); + strcpy (module_dir, prefix); + strcat (module_dir, "/share/guile/" SCM_EFFECTIVE_VERSION); + + ccache_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); + strcpy (ccache_dir, prefix); + strcat (ccache_dir, "/lib/guile/" SCM_EFFECTIVE_VERSION "/ccache"); + env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); if (env && strcmp (env, "") == 0) /* special-case interpret system-path=="" as meaning no system path instead @@ -333,10 +360,7 @@ else if (env) path = scm_parse_path (scm_from_locale_string (env), path); else - path = scm_list_4 (scm_from_locale_string (SCM_LIBRARY_DIR), - scm_from_locale_string (SCM_SITE_DIR), - scm_from_locale_string (SCM_GLOBAL_SITE_DIR), - scm_from_locale_string (SCM_PKGDATA_DIR)); + path = scm_list_1 (scm_from_locale_string (module_dir)); env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); if (env && strcmp (env, "") == 0) @@ -346,8 +370,7 @@ cpath = scm_parse_path (scm_from_locale_string (env), cpath); else { - cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), - scm_from_locale_string (SCM_SITE_CCACHE_DIR)); + cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); } #endif /* SCM_LIBRARY_DIR */ owmsg=1'>Expand)Author 2018-11-28grafts: Record metadata as derivation properties....Ludovic Courtès 2017-08-24graft: Correctly replace references near the end of the scan buffer....Ludovic Courtès 2017-01-25grafts: Do not pull derivation outputs not depended on....Ludovic Courtès 2016-10-17grafts: Apply the right grafts in the presence of multiple outputs....Ludovic Courtès 2016-10-14grafts: 'graft-derivation' does now introduce grafts that shadow other grafts....Ludovic Courtès 2016-10-03grafts: Allow the replacement to have a different name....Ludovic Courtès 2016-07-12gexp: Remove more uses of #:modules....Ludovic Courtès 2016-05-21grafts: Rename files whose name matches a graft....Ludovic Courtès 2016-05-21grafts: Preserve empty directories when grafting....Ludovic Courtès 2016-04-03build: Add a Guile custom test driver using SRFI-64....Mathieu Lirzin 2016-03-01grafts: Graft recursively....Ludovic Courtès 2016-02-27grafts: Consider all the outputs in the graft mapping....Ludovic Courtès 2016-02-22grafts: 'name' parameter of 'graft-derivation' is now optional....Ludovic Courtès 2016-02-22derivations: Move grafts to (guix grafts)....Ludovic Courtès