ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

distro: Change relocatable-Guile patch to work around broken argv[0].

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2012-10-17 17:47:23 +02:00
parent 9b9b6f3d51
commit b7f280ee3e
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
distro/patches/guile-relocatable.patch
View file

@ -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. location of the `guile' binary, allowing it to be relocated.
diff --git a/libguile/load.c b/libguile/load.c diff --git a/libguile/load.c b/libguile/load.c
index af2ca45..751c903 100644 index af2ca45..19dd338 100644
--- a/libguile/load.c --- a/libguile/load.c
+++ b/libguile/load.c +++ b/libguile/load.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -13,16 +13,22 @@ index af2ca45..751c903 100644
#include "libguile/_scm.h" #include "libguile/_scm.h"
#include "libguile/private-gc.h" /* scm_getenv_int */ #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; SCM cpath = SCM_EOL;
#ifdef SCM_LIBRARY_DIR #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, + /* 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"); + prefix = scm_gc_malloc_pointerless (strlen (bin_dir) + 4, "string");
+ strcpy (prefix, bin_dir); + strcpy (prefix, bin_dir);
@ -40,21 +46,25 @@ index af2ca45..751c903 100644
env = getenv ("GUILE_SYSTEM_PATH"); env = getenv ("GUILE_SYSTEM_PATH");
if (env && strcmp (env, "") == 0) if (env && strcmp (env, "") == 0)
/* special-case interpret system-path=="" as meaning no system path instead /* 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) else if (env)
path = scm_parse_path (scm_from_locale_string (env), path); path = scm_parse_path (scm_from_locale_string (env), path);
else else
- path = scm_list_4 (scm_from_locale_string (SCM_LIBRARY_DIR), - 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_SITE_DIR), - scm_from_locale_string (SCM_GLOBAL_SITE_DIR),
scm_from_locale_string (SCM_GLOBAL_SITE_DIR), - scm_from_locale_string (SCM_PKGDATA_DIR));
scm_from_locale_string (SCM_PKGDATA_DIR)); + path = scm_list_1 (scm_from_locale_string (module_dir));
@@ -276,7 +297,7 @@ scm_init_load_path ()
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); cpath = scm_parse_path (scm_from_locale_string (env), cpath);
else else
{ {
- cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), - 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 */