Author: svn-role Date: Fri Sep 20 04:01:05 2019 New Revision: 1867199 URL: http://svn.apache.org/viewvc?rev=1867199&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 Modified: subversion/branches/1.11.x/ (props changed) subversion/branches/1.11.x/STATUS subversion/branches/1.11.x/build/ac-macros/swig.m4 subversion/branches/1.11.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Propchange: subversion/branches/1.11.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 20 04:01:05 2019 @@ -100,4 +100,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845212,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1852013,1853483,1853761,1854072,1854074,1854216,1857367 +/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845212,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1852013,1853483,1853761,1854072,1854074,1854216,1857367,1857391 Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1867199&r1=1867198&r2=1867199&view=diff ============================================================================== --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Fri Sep 20 04:01:05 2019 @@ -68,12 +68,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 Modified: subversion/branches/1.11.x/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/build/ac-macros/swig.m4?rev=1867199&r1=1867198&r2=1867199&view=diff ============================================================================== --- subversion/branches/1.11.x/build/ac-macros/swig.m4 (original) +++ subversion/branches/1.11.x/build/ac-macros/swig.m4 Fri Sep 20 04:01:05 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.11.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1867199&r1=1867198&r2=1867199&view=diff ============================================================================== --- subversion/branches/1.11.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original) +++ subversion/branches/1.11.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Fri Sep 20 04:01:05 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" @@ -3369,10 +3369,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(); }