Matthias,
I've tried your patch both on our Windows buildslave (VC++ Express 2005)
and on my laptop (VS.NET 2003) and they have the same link problem:
Build FAILED.
..\..\..\subversion\libsvn_repos\reporter.c(142): warning C4244: 'function' : conversion from 'apr_uint64_t' to 'apr_size_t', possible loss of data
..\..\..\subversion\libsvn_repos\reporter.c(143): warning C4244: 'function' : conversion from 'apr_uint64_t' to 'apr_size_t', possible loss of data
..\..\..\subversion\libsvn_repos\reporter.c(159): warning C4244: '=' : conversion from 'apr_uint64_t' to 'svn_revnum_t', possible loss of data
..\..\..\subversion\libsvn_subr\nls.c(85): warning C4013: 'apr_conv_ucs2_to_utf8' undefined; assuming extern returning int
..\..\..\subversion\libsvn_subr\config_win.c(69): warning C4013: 'apr_conv_ucs2_to_utf8' undefined; assuming extern returning int
..\..\..\subversion\libsvn_subr\config_win.c(118): warning C4013: 'apr_conv_utf8_to_ucs2' undefined; assuming extern returning int
libsvn_subr-1.lib(nls.obj) : error LNK2019: unresolved external symbol _apr_conv_ucs2_to_utf8 referenced in function _svn_nls_init
libsvn_subr-1.lib(config_win.obj) : error LNK2001: unresolved external symbol _apr_conv_ucs2_to_utf8
libsvn_subr-1.lib(config_win.obj) : error LNK2019: unresolved external symbol _apr_conv_utf8_to_ucs2 referenced in function _utf8_to_ucs2
..\..\..\Release\subversion\mod_dav_svn\mod_dav_svn.so : fatal error LNK1120: 2 unresolved externals
Apparently these internal apr headers were included there for a reason. Maybe someone else on the list has suggestions for other ways to get those headers removed.
regards,
Lieven.
Matthias Miller wrote:
> I have included a patch to remove references to internal APR headers.
> It appears that these headers are unnecessary, and it prevents a clean
> apr install in a MinGW/msys environment.
>
> -Matthias Miller
>
> [[[
> * subversion/libsvn_subr/nls.c: remove references to internal APR headers
>
> * subversion/libsvn_subr/config_win.c: remove references to internal
> APR headers
> ]]]
> ------------------------------------------------------------------------
>
> Index: subversion/libsvn_subr/nls.c
> ===================================================================
> --- subversion/libsvn_subr/nls.c (revision 21357)
> +++ subversion/libsvn_subr/nls.c (working copy)
> @@ -34,15 +34,7 @@
>
> #include "svn_private_config.h"
>
> -#ifdef WIN32
> -/* FIXME: We're using an internal APR header here, which means we
> - have to build Subversion with APR sources. This being Win32-only,
> - that should be fine for now, but a better solution must be found in
> - combination with issue #850. */
> -#include <arch/win32/apr_arch_utf8.h>
> -#endif
>
> -
> svn_error_t *
> svn_nls_init(void)
> {
> Index: subversion/libsvn_subr/config_win.c
> ===================================================================
> --- subversion/libsvn_subr/config_win.c (revision 21357)
> +++ subversion/libsvn_subr/config_win.c (working copy)
> @@ -27,11 +27,6 @@
> #include <shlobj.h>
>
> #include <apr_file_info.h>
> -/* FIXME: We're using an internal APR header here, which means we
> - have to build Subversion with APR sources. This being Win32-only,
> - that should be fine for now, but a better solution must be found in
> - combination with issue #850. */
> -#include <arch/win32/apr_arch_utf8.h>
>
> #include "svn_error.h"
> #include "svn_path.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 15 19:15:37 2006