You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2019/05/30 04:00:09 UTC
svn commit: r1860377 - in /subversion/branches/1.12.x: ./ STATUS
build/ac-macros/swig.m4
subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Author: svn-role
Date: Thu May 30 04:00:08 2019
New Revision: 1860377
URL: http://svn.apache.org/viewvc?rev=1860377&view=rev
Log:
Merge r1857391 from trunk:
* r1857391
Fix build with APR 1.7.0.
Justification:
Bogus configure script check relies on APR internals.
See https://svn.haxx.se/users/archive-2019-04/0041.shtml
and https://svn.haxx.se/dev/archive-2019-04/0020.shtml
Votes:
+1: stsp, rhuijben (bindings change so 2+1's is enough)
Modified:
subversion/branches/1.12.x/ (props changed)
subversion/branches/1.12.x/STATUS
subversion/branches/1.12.x/build/ac-macros/swig.m4
subversion/branches/1.12.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Propchange: subversion/branches/1.12.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 30 04:00:08 2019
@@ -102,3 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
+/subversion/trunk:1857391
Modified: subversion/branches/1.12.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/STATUS?rev=1860377&r1=1860376&r2=1860377&view=diff
==============================================================================
--- subversion/branches/1.12.x/STATUS (original)
+++ subversion/branches/1.12.x/STATUS Thu May 30 04:00:08 2019
@@ -58,12 +58,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1857391
- Fix build with APR 1.7.0.
- Justification:
- Bogus configure script check relies on APR internals.
- See https://svn.haxx.se/users/archive-2019-04/0041.shtml
- and https://svn.haxx.se/dev/archive-2019-04/0020.shtml
- Votes:
- +1: stsp, rhuijben (bindings change so 2+1's is enough)
Modified: subversion/branches/1.12.x/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/build/ac-macros/swig.m4?rev=1860377&r1=1860376&r2=1860377&view=diff
==============================================================================
--- subversion/branches/1.12.x/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.12.x/build/ac-macros/swig.m4 Thu May 30 04:00:08 2019
@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG,
ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
])
SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
-
- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
- dnl thus the egrep patterns have a + in them.
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
- [svn_cv_pycfmt_apr_int64_t], [
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="L"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="l"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="i"])
- fi
- ])
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
- fi
- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
- ["$svn_cv_pycfmt_apr_int64_t"],
- [Define to the Python/C API format character suitable]
- [ for apr_int64_t])
fi
if test "$PERL" != "none"; then
Modified: subversion/branches/1.12.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1860377&r1=1860376&r2=1860377&view=diff
==============================================================================
--- subversion/branches/1.12.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/1.12.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Thu May 30 04:00:08 2019
@@ -46,7 +46,7 @@
#include "svn_mergeinfo.h"
#include "svn_types.h"
-#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
+#include "svn_private_config.h"
#include "swig_python_external_runtime.swg"
#include "swigutil_py.h"
@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_re
svn_swig_py_acquire_py_lock();
if ((result = PyObject_CallFunction(receiver,
- (char *)
- (SVN_APR_INT64_T_PYCFMT "lsssO&"),
- line_no, revision, author, date, line,
- make_ob_pool, pool)) == NULL)
+ (char *)"LlsssO&",
+ (PY_LONG_LONG)line_no, revision, author,
+ date, line, make_ob_pool, pool)) == NULL)
{
err = callback_exception_error();
}