From 501ad55982a8f92a7a95c76c75944d644870181d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 12 Mar 2020 15:16:04 +0100
Subject: [PATCH] load: Make Guile run-time relocatable using /proc/self/exe.

Import from

    http://git.savannah.gnu.org/cgit/guix.git/commit/?id=920f2c42ce3345dc1355a41377ebf01a33fdae51
---
 libguile/load.c | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/libguile/load.c b/libguile/load.c
index c2ee5093a..128cdf95a 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <libgen.h>
 
 #include "libguile/_scm.h"
 #include "libguile/alist.h"
@@ -325,6 +326,32 @@ scm_init_load_path ()
   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 @@ 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),
-                       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 @@ 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),
-                          scm_from_locale_string (SCM_SITE_CCACHE_DIR));
+      cpath = scm_list_1 (scm_from_locale_string (ccache_dir));
     }
 
 #endif /* SCM_LIBRARY_DIR */
-- 
2.24.0

e:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Liliana Marie Prikler &lt;liliana.prikler@gmail.com&gt;</td><td class='right'>2023-10-23 21:09:49 +0200</td></tr>
<tr><th>committer</th><td>Liliana Marie Prikler &lt;liliana.prikler@gmail.com&gt;</td><td class='right'>2023-10-23 21:09:49 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu?id=e38d6a9c2fba815ac34e74baa843f15e33846813'>e38d6a9c2fba815ac34e74baa843f15e33846813</a> (<a href='/guix/patch/gnu?id=e38d6a9c2fba815ac34e74baa843f15e33846813'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=e38d6a9c2fba815ac34e74baa843f15e33846813'>0a3dd602449386119fc15de32a5cf7e5f607b2a1</a> /<a href='/guix/tree/gnu?id=e38d6a9c2fba815ac34e74baa843f15e33846813'>gnu</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu?id=da716c8b9cdc358609a368bd5da70b31cd97a938'>da716c8b9cdc358609a368bd5da70b31cd97a938</a> (<a href='/guix/diff/gnu?id=e38d6a9c2fba815ac34e74baa843f15e33846813&amp;id2=da716c8b9cdc358609a368bd5da70b31cd97a938'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu?id=cbd20d627497053871db863970c07d93c7081786'>cbd20d627497053871db863970c07d93c7081786</a> (<a href='/guix/diff/gnu?id=e38d6a9c2fba815ac34e74baa843f15e33846813&amp;id2=cbd20d627497053871db863970c07d93c7081786'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-e38d6a9c2fba815ac34e74baa843f15e33846813.tar.gz'>guix-e38d6a9c2fba815ac34e74baa843f15e33846813.tar.gz</a><br/><a href='/guix/snapshot/guix-e38d6a9c2fba815ac34e74baa843f15e33846813.zip'>guix-e38d6a9c2fba815ac34e74baa843f15e33846813.zip</a><br/></td></tr></table>
<div class='commit-subject'>Merge branch 'master' into gnome-team</div><div class='commit-msg'>Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191
</div><div class='diffstat-header'><a href='/guix/diff/?id=e38d6a9c2fba815ac34e74baa843f15e33846813'>Diffstat</a> (limited to 'gnu')</div><table summary='diffstat' class='diffstat'>