You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2016/10/11 13:55:30 UTC
svn commit: r1764248 - in /subversion/branches/ra-git: build.conf
build/generator/gen_win_dependencies.py subversion/libsvn_ra_git/fetch.c
Author: rhuijben
Date: Tue Oct 11 13:55:30 2016
New Revision: 1764248
URL: http://svn.apache.org/viewvc?rev=1764248&view=rev
Log:
On the ra-git branch: Fix compilation of libsvn_ra_git.
* build/generator/gen_win_dependencies.py
Add libssh2 as optional dependency.
* build.conf
(libssh2): Declare known library and dependency on openssl.
(libgit2): Depend on libssh2.
* subversion/libsvn_ra_git/fetch.c
(svn_ra_git__wrap_git_error): Remove unused function.
Modified:
subversion/branches/ra-git/build.conf
subversion/branches/ra-git/build/generator/gen_win_dependencies.py
subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c
Modified: subversion/branches/ra-git/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/build.conf?rev=1764248&r1=1764247&r2=1764248&view=diff
==============================================================================
--- subversion/branches/ra-git/build.conf (original)
+++ subversion/branches/ra-git/build.conf Tue Oct 11 13:55:30 2016
@@ -1509,10 +1509,17 @@ external-lib = $(SVN_SQLITE_LIBS)
pkg-config = sqlite3
pkg-config-private = yes
+[libssh2]
+type = lib
+external-lib = $(SVN_LIBSSH2_LIBS)
+libs = openssl
+msvc-libs = libssh2.lib
+
[libgit2]
type = lib
external-lib = $(SVN_LIBGIT2_LIBS)
-msvc-libs = winhttp.lib
+libs = libssh2
+msvc-libs = winhttp.lib libssh2.lib
[xml]
type = lib
Modified: subversion/branches/ra-git/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/build/generator/gen_win_dependencies.py?rev=1764248&r1=1764247&r2=1764248&view=diff
==============================================================================
--- subversion/branches/ra-git/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/ra-git/build/generator/gen_win_dependencies.py Tue Oct 11 13:55:30 2016
@@ -113,6 +113,7 @@ class GenDependenciesBase(gen_base.Gener
'intl',
'serf',
'libgit2',
+ 'libssh2',
'sasl',
'swig',
'perl',
Modified: subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c?rev=1764248&r1=1764247&r2=1764248&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c Tue Oct 11 13:55:30 2016
@@ -62,19 +62,6 @@ do_libgit2_init(void *baton, apr_pool_t
/*** Miscellaneous helper functions ***/
-svn_error_t *
-svn_ra_git__wrap_git_error(void)
-{
- git_error git_err;
-
- if (giterr_detach(&git_err) == -1)
- SVN_ERR_MALFUNCTION();
-
- /* ### TODO: map error code */
- return svn_error_createf(SVN_ERR_FS_GIT_LIBGIT2_ERROR, NULL,
- _("git: %s"), git_err.message);
-}
-
static apr_status_t
cleanup_git_remote(void *baton)
{
@@ -155,7 +142,8 @@ svn_ra_git__split_url(const char **repos
apr_pool_cleanup_null);
/* ... and try to connect to it. */
- git_err = git_remote_connect(remote, GIT_DIRECTION_FETCH, callbacks);
+ git_err = git_remote_connect(remote, GIT_DIRECTION_FETCH, callbacks,
+ NULL /* custom_headers */);
if (!git_err)
{
found_remote = TRUE;