You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/05/02 06:25:36 UTC
svn commit: r1677273 - in /subversion/trunk: configure.ac
subversion/libsvn_fs/fs-loader.c subversion/libsvn_ra/ra_loader.c
Author: brane
Date: Sat May 2 04:25:36 2015
New Revision: 1677273
URL: http://svn.apache.org/r1677273
Log:
Support the --enable-runtime-module-search configure option on Mac OS X.
OSX shared libraries have a MAJOR.SOVERSION.dylib suffix instead of the
MAJOR.so.SOVERSION more common on ELF platforms.
* configure.ac (SVN_DSO_SUFFIX_FMT): New platform-specific variable.
* subversion/libsvn_fs/fs-loader.c (load_module),
* subversion/libsvn_ra/ra_loader.c (load_ra_module):
Use SVN_DSO_SUFFIX_FMT to construct the library name.
Modified:
subversion/trunk/configure.ac
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1677273&r1=1677272&r2=1677273&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sat May 2 04:25:36 2015
@@ -1354,6 +1354,19 @@ AS_HELP_STRING([--enable-runtime-module-
fi
AC_DEFINE(SVN_USE_DSO, 1,
[Defined if svn should try to load DSOs])
+
+ dnl Mac OS X uses libname.MAJOR.SOVERSION.dylib
+ dnl Most other unixes use libname.MAJOR.so.SOVERSION
+ case "$host" in
+ *-*-darwin*)
+ AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.%d.dylib"],
+ [Shared library file name suffix format])
+ ;;
+ *)
+ AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.so.%d"],
+ [Shared library file name suffix format])
+ ;;
+ esac
fi
])
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1677273&r1=1677272&r2=1677273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Sat May 2 04:25:36 2015
@@ -139,7 +139,7 @@ load_module(fs_init_func_t *initfunc, co
_("Invalid name for FS type '%s'"),
name);
- libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.%d",
+ libname = apr_psprintf(pool, "libsvn_fs_%s-" SVN_DSO_SUFFIX_FMT,
name, SVN_VER_MAJOR, SVN_SOVERSION);
funcname = apr_psprintf(pool, "svn_fs_%s__init", name);
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1677273&r1=1677272&r2=1677273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Sat May 2 04:25:36 2015
@@ -143,7 +143,7 @@ load_ra_module(svn_ra__init_func_t *func
const char *compat_funcname;
apr_status_t status;
- libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d",
+ libname = apr_psprintf(pool, "libsvn_ra_%s-" SVN_DSO_SUFFIX_FMT,
ra_name, SVN_VER_MAJOR, SVN_SOVERSION);
funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);