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 2015/12/03 22:14:33 UTC
svn commit: r1717848 - in /subversion/branches/ra-git: ./
build/ac-macros/libgit2.m4 configure.ac tools/dev/unix-build/Makefile.svn
Author: rhuijben
Date: Thu Dec 3 21:14:33 2015
New Revision: 1717848
URL: http://svn.apache.org/viewvc?rev=1717848&view=rev
Log:
Catch up with trunk at r1717847 and try to fix some unix linkage issues for libgit2
Modified:
subversion/branches/ra-git/ (props changed)
subversion/branches/ra-git/build/ac-macros/libgit2.m4
subversion/branches/ra-git/configure.ac
subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn
Propchange: subversion/branches/ra-git/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 3 21:14:33 2015
@@ -95,4 +95,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1583624-1717844
+/subversion/trunk:1583624-1717847
Modified: subversion/branches/ra-git/build/ac-macros/libgit2.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/libgit2.m4?rev=1717848&r1=1717847&r2=1717848&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/libgit2.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/libgit2.m4 Thu Dec 3 21:14:33 2015
@@ -27,6 +27,11 @@ AC_DEFUN(SVN_LIB_GIT2,
[
libgit2_found=no
+ git2_check_major="$1"
+ git2_check_minor="$2"
+ git2_check_patch="$3"
+ git2_check_version="$1.$2.$3"
+
AC_ARG_WITH(libgit2,AS_HELP_STRING([--with-libgit2=PREFIX],
[libgit2 library]),
[
Modified: subversion/branches/ra-git/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/configure.ac?rev=1717848&r1=1717847&r2=1717848&view=diff
==============================================================================
--- subversion/branches/ra-git/configure.ac (original)
+++ subversion/branches/ra-git/configure.ac Thu Dec 3 21:14:33 2015
@@ -123,6 +123,9 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
dnl Search for serf
SVN_LIB_SERF(1,3,4)
+dnl Search for libgit2
+SVN_LIB_GIT2(0,23,4)
+
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE([SVN_HAVE_SERF], 1,
[Defined if support for Serf is enabled])
@@ -1005,6 +1008,7 @@ AC_SUBST([libsvn_diff_LDFLAGS])
AC_SUBST([libsvn_fs_LDFLAGS])
AC_SUBST([libsvn_fs_base_LDFLAGS])
AC_SUBST([libsvn_fs_fs_LDFLAGS])
+AC_SUBST([libsvn_fs_git_LDFLAGS])
AC_SUBST([libsvn_fs_util_LDFLAGS])
AC_SUBST([libsvn_ra_LDFLAGS])
AC_SUBST([libsvn_ra_local_LDFLAGS])
@@ -1201,8 +1205,6 @@ AS_HELP_STRING([--with-editor=PATH],
SVN_LIB_Z
-SVN_LIB_GIT2
-
MOD_ACTIVATION=""
AC_ARG_ENABLE(mod-activation,
AS_HELP_STRING([--enable-mod-activation],
@@ -1375,30 +1377,31 @@ AS_HELP_STRING([--enable-runtime-module-
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_LOCAL, 1,
- [Defined if libsvn_client should link against libsvn_ra_local])
+ [Defined if libsvn_ra should link against libsvn_ra_local])
svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
svn_ra_lib_install_deps="install-ramod-lib"
svn_ra_lib_link="\$(RA_LOCAL_LINK)"
AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_SVN, 1,
- [Defined if libsvn_client should link against libsvn_ra_svn])
+ [Defined if libsvn_ra should link against libsvn_ra_svn])
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_SERF, 1,
- [Defined if libsvn_client should link against libsvn_ra_serf])
+ [Defined if libsvn_ra should link against libsvn_ra_serf])
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SERF_DEPS)"
svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-serf-lib"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SERF_LINK)"
fi
- # TODO: make libgit2 support optional?
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_GIT, 1,
- [Defined if libsvn_client should link against libsvn_ra_git])
- svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_GIT_DEPS)"
- svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-ramod-lib"
- svn_ra_lib_link="$svn_ra_lib_link \$(RA_GIT_LINK)"
+ if test "$svn_lib_git" = "yes"; then
+ AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_GIT, 1,
+ [Defined if libsvn_ra should link against libsvn_ra_git])
+ svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_GIT_DEPS)"
+ svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-ramod-lib"
+ svn_ra_lib_link="$svn_ra_lib_link \$(RA_GIT_LINK)"
+ fi
SVN_RA_LIB_DEPS=$svn_ra_lib_deps
SVN_RA_LIB_INSTALL_DEPS=$svn_ra_lib_install_deps
Modified: subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn?rev=1717848&r1=1717847&r2=1717848&view=diff
==============================================================================
--- subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn Thu Dec 3 21:14:33 2015
@@ -84,7 +84,7 @@ BZ2_VER = 1.0.6
PYTHON_VER = 2.7.8
JUNIT_VER = 4.10
GETTEXT_VER = 0.18.3.1
-LIBGIT2_VER = 0.20.0
+LIBGIT2_VER = 0.23.4
BDB_DIST = db-$(BDB_VER).tar.gz
APR_ICONV_DIST = apr-iconv-$(APR_ICONV_VER).tar.gz
@@ -114,6 +114,7 @@ SHA256_${BZ2_DIST} = a2848f34fcd5d6cf47d
SHA256_${PYTHON_DIST} = 74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557
SHA256_${JUNIT_DIST} = 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
SHA256_${GETTEXT_DIST} = 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d
+SHA256_${LIBGIT2_DIST} = c7f5e2d7381dbc4d7e878013d14f9993ae8a41bd23f032718e39ffba57894029
define do_check_sha256
if [ -x /bin/sha256 ]; then \