Author: svn-role
Date: Wed May 22 04:02:11 2013
New Revision: 1485050
URL: http://svn.apache.org/r1485050
Log:
Merge r1482724 from trunk:
* r1482724
Fix a link error when configured with --enable-runtime-module-search.
Justification:
Build fails.
Votes:
+1: philip, rhuijben, stsp, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build.conf
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1482724
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1485050&r1=1485049&r2=1485050&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 22 04:02:11 2013
@@ -143,13 +143,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1482724
- Fix a link error when configured with --enable-runtime-module-search.
- Justification:
- Build fails.
- Votes:
- +1: philip, rhuijben, stsp, breser
-
* r1484755
Fix SVN_ERR_ASSERT macro to provide failed expression, instead of
evaluated value when compiled using Visual Studio 2010.
Modified: subversion/branches/1.8.x/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/build.conf?rev=1485050&r1=1485049&r2=1485050&view=diff
==============================================================================
--- subversion/branches/1.8.x/build.conf (original)
+++ subversion/branches/1.8.x/build.conf Wed May 22 04:02:11 2013
@@ -241,7 +241,7 @@ description = Subversion Repository File
type = lib
path = subversion/libsvn_fs
install = ramod-lib
-libs = libsvn_fs_util libsvn_subr fs-libs aprutil apr
+libs = libsvn_fs_util libsvn_delta libsvn_subr fs-libs aprutil apr
# conditionally add more dependencies
add-deps = $(SVN_FS_LIB_DEPS)
add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
