Author: rinrab
Date: Sun Oct 6 08:33:14 2024
New Revision: 1921144
URL: http://svn.apache.org/viewvc?rev=1921144&view=rev
Log:
Use SVN_DSO_SUFFIX_FMT definition for determining the name of the DSO
auth modules when loading them. As it is required, always setup the
SVN_DSO_SUFFIX_FMT definition even if we don't use DSO modules for FS
and RA modules on CMake and autoconf build systems.
Also this fixes incorrect loading of the auth libraries with CMake, that
builds the libraries with different names (going to be fixed soon).
* CMakeLists.txt
(dso): Move SVN_DSO_SUFFIX_FMT setting outside from if(SVN_USE_DSO).
* configure.ac
(dso): Move DSO settings outside from the block, executed only in case of
enabled --enable-runtime-module-search option.
* subversion/libsvn_subr/auth.c
(svn_auth_get_platform_specific_provider->library_name): Replace '%d.so.%d'
constant in library name template string with SVN_DSO_SUFFIX_FMT, which
actually should be the same on Linux, the only platform this code is
running on, following no functional changes with autoconf.
Modified:
subversion/trunk/CMakeLists.txt
subversion/trunk/configure.ac
subversion/trunk/subversion/libsvn_subr/auth.c
Modified: subversion/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1921144&r1=1921143&r2=1921144&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Sun Oct 6 08:33:14 2024
@@ -151,13 +151,13 @@ endif()
if(SVN_USE_DSO)
add_compile_definitions("SVN_USE_DSO")
- string(APPEND PRIVATE_CONFIG_DEFINITIONS
- "\n"
- "/* Shared library file name suffix format */\n"
- "#define SVN_DSO_SUFFIX_FMT \"%d${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n"
- )
endif()
+string(APPEND PRIVATE_CONFIG_DEFINITIONS
+ "\n"
+ "/* Shared library file name suffix format */\n"
+ "#define SVN_DSO_SUFFIX_FMT \"%d${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n"
+)
add_compile_definitions("SVN_SOVERSION=1")
if (SVN_ENABLE_TESTS)
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1921144&r1=1921143&r2=1921144&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sun Oct 6 08:33:14 2024
@@ -1492,22 +1492,22 @@ 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
])
+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
+
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_LOCAL, 1,
[Defined if libsvn_ra should link against libsvn_ra_local])
Modified: subversion/trunk/subversion/libsvn_subr/auth.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/auth.c?rev=1921144&r1=1921143&r2=1921144&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/auth.c (original)
+++ subversion/trunk/subversion/libsvn_subr/auth.c Sun Oct 6 08:33:14 2024
@@ -508,7 +508,7 @@ svn_auth_get_platform_specific_provider(
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,
- "libsvn_auth_%s-%d.so.%d",
+ "libsvn_auth_%s-" SVN_DSO_SUFFIX_FMT,
provider_name,
SVN_VER_MAJOR, SVN_SOVERSION);
library_label = apr_psprintf(pool, "svn_%s", provider_name);
