diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 17:47:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 23:25:25 +0200 |
| commit | b7f280ee3e33f87080b751543b6c5ab16955687c (patch) | |
| tree | fd2986aef15565aefa7598748095fb7f3b35bbf1 | |
| parent | 9b9b6f3d51fe5a4fed4ee8f5eda96a0f350e751b (diff) | |
| download | patches-b7f280ee3e33f87080b751543b6c5ab16955687c.tar patches-b7f280ee3e33f87080b751543b6c5ab16955687c.tar.gz | |
distro: Change relocatable-Guile patch to work around broken argv[0].
* distro/patches/guile-relocatable.patch: Change to use /proc/self/exe
instead of PROGRAM_INVOCATION_NAME. Useful because Nix itself passes
just the basename of builders that it executes.
| -rw-r--r-- | distro/patches/guile-relocatable.patch | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/distro/patches/guile-relocatable.patch b/distro/patches/guile-relocatable.patch index d96d6a8c9a..077394cdde 100644 --- a/distro/patches/guile-relocatable.patch +++ b/distro/patches/guile-relocatable.patch @@ -2,7 +2,7 @@ This patch changes Guile to use a default search path relative to the location of the `guile' binary, allowing it to be relocated. diff --git a/libguile/load.c b/libguile/load.c -index af2ca45..751c903 100644 +index af2ca45..19dd338 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -26,6 +26,7 @@ @@ -13,16 +13,22 @@ index af2ca45..751c903 100644 #include "libguile/_scm.h" #include "libguile/private-gc.h" /* scm_getenv_int */ -@@ -255,6 +256,26 @@ scm_init_load_path () +@@ -255,6 +256,32 @@ scm_init_load_path () SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR -+ char *bin_dir, *prefix, *module_dir, *ccache_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. */ ++ relative to the executable's location. + -+ bin_dir = dirname (strdupa (program_invocation_name)); ++ 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); @@ -40,21 +46,25 @@ index af2ca45..751c903 100644 env = getenv ("GUILE_SYSTEM_PATH"); if (env && strcmp (env, "") == 0) /* special-case interpret system-path=="" as meaning no system path instead -@@ -263,7 +284,7 @@ scm_init_load_path () +@@ -263,10 +290,7 @@ scm_init_load_path () 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), -+ path = scm_list_4 (scm_from_locale_string (module_dir), - scm_from_locale_string (SCM_SITE_DIR), - scm_from_locale_string (SCM_GLOBAL_SITE_DIR), - scm_from_locale_string (SCM_PKGDATA_DIR)); -@@ -276,7 +297,7 @@ scm_init_load_path () +- 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 = getenv ("GUILE_SYSTEM_COMPILED_PATH"); + if (env && strcmp (env, "") == 0) +@@ -276,8 +300,7 @@ scm_init_load_path () cpath = scm_parse_path (scm_from_locale_string (env), cpath); else { - cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), -+ cpath = scm_list_2 (scm_from_locale_string (ccache_dir), - scm_from_locale_string (SCM_SITE_CCACHE_DIR)); +- scm_from_locale_string (SCM_SITE_CCACHE_DIR)); ++ cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); } + #endif /* SCM_LIBRARY_DIR */ |