[patch] r31852 and autogen.sh

bug229045a.patch (text/plain), 2.65 KB, created by Martin von Gagern on 2008-06-30 18:41:03 UTC

Make libsvn_ra depend on libsvn_delta unconditionally.
It uses these symbols from libsvn_delta:
svn_txdelta
svn_txdelta_send_stream
svn_txdelta_send_txstream
svn_compat_wrap_file_rev_handler
   
Because only the RA protocol libraries depended on libsvn_delta,
libsvn_ra failed to load on its own if runtime module search
was enabled.

References:
http://svn.collab.net/viewvc/svn?view=rev&revision=31852
https://bugs.gentoo.org/show_bug.cgi?id=229045
https://bugs.launchpad.net/bzr-svn/+bug/242321

2008-06-30 Martin von Gagern <[e-mail]>

diff -ur subversion-1.5.0/build.conf subversion-1.5.0-bug229045/build.conf
--- subversion-1.5.0/build.conf	2008-05-15 05:57:18.000000000 +0200
+++ subversion-1.5.0-bug229045/build.conf	2008-06-30 17:58:53.000000000 +0200
@@ -263,7 +263,7 @@
 description = Subversion Repository Access Library
 type = lib
 path = subversion/libsvn_ra
-libs = libsvn_subr ra-libs apriconv apr
+libs = libsvn_delta libsvn_subr ra-libs apriconv apr
 # conditionally add more dependencies
 add-deps = $(SVN_RA_LIB_DEPS)
 add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
diff -ur subversion-1.5.0/build-outputs.mk subversion-1.5.0-bug229045/build-outputs.mk
--- subversion-1.5.0/build-outputs.mk	2008-06-18 05:34:20.000000000 +0200
+++ subversion-1.5.0-bug229045/build-outputs.mk	2008-06-30 17:58:53.000000000 +0200
@@ -230,10 +230,10 @@
 
 libsvn_ra_PATH = subversion/libsvn_ra
 install-lib: $(SVN_RA_LIB_INSTALL_DEPS)
-libsvn_ra_DEPS = $(SVN_RA_LIB_DEPS) subversion/libsvn_ra/compat.lo subversion/libsvn_ra/ra_loader.lo subversion/libsvn_ra/util.lo subversion/libsvn_subr/libsvn_subr-1.la
+libsvn_ra_DEPS = $(SVN_RA_LIB_DEPS) subversion/libsvn_ra/compat.lo subversion/libsvn_ra/ra_loader.lo subversion/libsvn_ra/util.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
 libsvn_ra_OBJECTS = compat.lo ra_loader.lo util.lo
 subversion/libsvn_ra/libsvn_ra-1.la: $(libsvn_ra_DEPS)
-	cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 libsvn_ra_local_PATH = subversion/libsvn_ra_local
 libsvn_ra_local_DEPS =  subversion/libsvn_ra_local/ra_plugin.lo subversion/libsvn_ra_local/split_url.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la