guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-3-66-g28a


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-3-66-g28af5ee
Date: Tue, 13 Oct 2009 09:31:36 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=28af5ee5eccb7797b73ad1caf88183e95eef0a28

The branch, master has been updated
       via  28af5ee5eccb7797b73ad1caf88183e95eef0a28 (commit)
      from  d71db1f9a984b8bbd5879bd09a98ac2444ea7eb2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 28af5ee5eccb7797b73ad1caf88183e95eef0a28
Author: Andy Wingo <address@hidden>
Date:   Tue Oct 13 11:31:02 2009 +0200

    add $libir to the ltdl path, not $pkglibdir; add extensionsdir
    
    * libguile/Makefile.am (libpath.h): Fix SCM_LIB_DIR to point to the
      libdir, not pkglibdir. Add SCM_EXTENSIONS_DIR, for a dir to put in the
      dynamic-link search path that's not managed by ldconfig or the like;
      and put this dir in the "extensionsdir" key of %guile-build-info.
    
    * libguile/dynl.c (sysdep_dynl_init): Rename the installed-libdir
      environment var to GUILE_SYSTEM_EXTENSIONS_PATH (from
      GUILE_SYSTEM_LTDL_PATH). Also add SCM_EXTENSIONS_DIR to the ltdl
      search path in the default case.
    * meta/uninstalled-env.in: Adapt override to match.
    
    * meta/guile-2.0.pc.in: Add extensionsdir, so you can pkg-config
      --variable=extensionsdir guile-2.0.

-----------------------------------------------------------------------

Summary of changes:
 libguile/Makefile.am    |    4 +++-
 libguile/dynl.c         |   11 +++++++----
 meta/guile-2.0.pc.in    |    1 +
 meta/uninstalled-env.in |    4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index acb26d9..2e8457b 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -601,7 +601,8 @@ libpath.h: $(srcdir)/Makefile.in  
$(top_builddir)/config.status
        @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
        @echo '#define SCM_LIBRARY_DIR 
"$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
        @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
-       @echo '#define SCM_LIB_DIR "$(pkglibdir)"' >> libpath.tmp
+       @echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp
+       @echo '#define SCM_EXTENSIONS_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
        @echo '#define SCM_CCACHE_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
        @echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> 
libpath.tmp
        @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
@@ -625,6 +626,7 @@ libpath.h: $(srcdir)/Makefile.in  
$(top_builddir)/config.status
        @echo ' { "pkglibdir",     "$(pkglibdir)" }, \' >> libpath.tmp
        @echo ' { "pkgincludedir", "$(pkgincludedir)" }, \' \
                >> libpath.tmp
+       @echo ' { "extensionsdir", 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
        @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
        @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
                >> libpath.tmp
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 6b13e65..52c43e5 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -118,17 +118,20 @@ sysdep_dynl_init ()
 
   lt_dlinit ();
 
-  env = getenv ("GUILE_SYSTEM_LTDL_PATH");
+  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)
+    /* 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);
-#ifdef SCM_LIB_DIR
   else
-    lt_dladdsearchdir (SCM_LIB_DIR);
-#endif
+    {
+      lt_dladdsearchdir (SCM_LIB_DIR);
+      lt_dladdsearchdir (SCM_EXTENSIONS_DIR);
+    }
 }
 
 scm_t_bits scm_tc16_dynamic_obj;
diff --git a/meta/guile-2.0.pc.in b/meta/guile-2.0.pc.in
index 5cacaaa..c73a171 100644
--- a/meta/guile-2.0.pc.in
+++ b/meta/guile-2.0.pc.in
@@ -7,6 +7,7 @@ address@hidden@
 address@hidden@/guile
 
 address@hidden@
address@hidden@/guile/@GUILE_EFFECTIVE_VERSION@/extensions
 address@hidden@
 
 Name: GNU Guile
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 649d1fc..58d50ca 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -89,8 +89,8 @@ if ( env | grep -v -q -E '^GUILE_SYSTEM_COMPILED_PATH=' ); 
then
   export GUILE_SYSTEM_COMPILED_PATH=
 fi
 # Don't look in installed dirs for dlopen-able modules
-if ( env | grep -v -q -E '^GUILE_SYSTEM_LTDL_PATH=' ); then
-  export GUILE_SYSTEM_LTDL_PATH=
+if ( env | grep -v -q -E '^GUILE_SYSTEM_EXTENSIONS_PATH=' ); then
+  export GUILE_SYSTEM_EXTENSIONS_PATH=
 fi
 
 # handle LTDL_LIBRARY_PATH (no clobber)


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]