>From b7a04164b9de62fe1e80f061f926c9255c84e710 Mon Sep 17 00:00:00 2001
From: Bruce Korb <[email protected]>
Date: Fri, 21 Sep 2012 16:33:44 -0700
Subject: [PATCH] do not augment environment
* libguile/dynl.c (augment_env): no longer used. Removed.
(sysdep_dynl_init): remove code that fiddled LD_LIBRARY_PATH
-- aka SHARED_LIBRARY_PATH_VARIABLE
(augment_env): removed. Not used any more.
---
libguile/dynl.c | 67 +++++++++++++++++++++----------------------------------
1 file changed, 25 insertions(+), 42 deletions(-)
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 72305a4..999627a 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -81,7 +81,25 @@ sysdep_dynl_link (const char *fname, const char *subr)
lt_dlhandle handle;
if (fname != NULL)
- handle = lt_dlopenext (fname);
+ {
+ char * buf;
+
+ handle = lt_dlopenext (fname);
+ if (handle == NULL)
+ do
+ {
+ static char const ext_dir[] = SCM_EXTENSIONS_DIR;
+ static char const lib_dir[] = SCM_LIB_DIR;
+ buf = alloca (max(sizeof (ext_dir), sizeof (lib_dir))
+ + strlen (fname) + 1); // fault on failure
+ sprintf (buf, "%s/%s", lib_dir, fname);
+ handle = lt_dlopenext (buf);
+ if (handle != NULL)
+ break;
+ sprintf (buf, "%s/%s", ext_dir, fname);
+ handle = lt_dlopenext (buf);
+ } while (0);
+ }
else
/* Return a handle for the program as a whole. */
handle = lt_dlopen (NULL);
@@ -120,30 +138,6 @@ sysdep_dynl_value (const char *symb, void *handle, const char *subr)
return fptr;
}
-/* Augment environment variable VARIABLE with VALUE, assuming VARIABLE
- is a path kind of variable. */
-static void
-augment_env (const char *variable, const char *value)
-{
- const char *env;
-
- env = getenv (variable);
- if (env != NULL)
- {
- char *new_value;
- static const char path_sep[] = { LT_PATHSEP_CHAR, 0 };
-
- new_value = alloca (strlen (env) + strlen (value) + 2);
- strcpy (new_value, env);
- strcat (new_value, path_sep);
- strcat (new_value, value);
-
- setenv (variable, new_value, 1);
- }
- else
- setenv (variable, value, 1);
-}
-
static void
sysdep_dynl_init ()
{
@@ -152,26 +146,15 @@ sysdep_dynl_init ()
lt_dlinit ();
env = getenv ("GUILE_SYSTEM_EXTENSIONS_PATH");
- if (env && strcmp (env, "") == 0)
- /* special-case interpret system-ltdl-path=="" as meaning no system path,
- which is the case during the build */
- ;
- else if (env)
+ if (env == NULL)
+ return;
+
+ /* special-case interpret system-ltdl-path=="" as meaning no system path,
+ which is the case during the build */
+ if (*env != '\0')
/* FIXME: should this be a colon-separated path? Or is the only point to
allow the build system to turn off the installed extensions path? */
lt_dladdsearchdir (env);
- else
- {
- /* Add SCM_LIB_DIR and SCM_EXTENSIONS_DIR to the loader's search
- path. `lt_dladdsearchdir' and $LTDL_LIBRARY_PATH can't be used
- for that because they are searched before the system-dependent
- search path, which is the one `libtool --mode=execute -dlopen'
- fiddles with (info "(libtool) Libltdl Interface"). See
- <http://lists.gnu.org/archive/html/guile-devel/2010-11/msg00095.html>
- for details. */
- augment_env (SHARED_LIBRARY_PATH_VARIABLE, SCM_LIB_DIR);
- augment_env (SHARED_LIBRARY_PATH_VARIABLE, SCM_EXTENSIONS_DIR);
- }
}
scm_t_bits scm_tc16_dynamic_obj;
--
1.7.10.4
