diff options
Diffstat (limited to 'debian/patches/python-builds')
| -rw-r--r-- | debian/patches/python-builds | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/python-builds b/debian/patches/python-builds index f55d7b7..30d79ab 100644 --- a/debian/patches/python-builds +++ b/debian/patches/python-builds @@ -14,7 +14,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in -index d6a173a..17632f0 100644 +index cee3c00..5eb6f45 100644 --- a/Makefile.in +++ b/Makefile.in @@ -148,6 +148,7 @@ BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAI @@ -22,11 +22,11 @@ index d6a173a..17632f0 100644 SWIG = @SWIG@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ - SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py + SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ SWIG_PY_LINK = @SWIG_PY_LINK@ diff --git a/build.conf b/build.conf -index 0c631bd..97218d7 100644 +index 53c0138..16bd7b9 100644 --- a/build.conf +++ b/build.conf @@ -498,7 +498,7 @@ external-project = svn_locale @@ -109,10 +109,10 @@ index 0c631bd..97218d7 100644 lang = python path = subversion/bindings/swig/python/libsvn_swig_py diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 2963872..3c05797 100644 +index c707a8c..fea7f0d 100644 --- a/build/ac-macros/swig.m4 +++ b/build/ac-macros/swig.m4 -@@ -108,7 +108,8 @@ AC_DEFUN(SVN_FIND_SWIG, +@@ -110,7 +110,8 @@ AC_DEFUN(SVN_FIND_SWIG, AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[ ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`" ]) @@ -121,9 +121,9 @@ index 2963872..3c05797 100644 + SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)" if test "$ac_cv_python_includes" = "none"; then - AC_MSG_WARN([python bindings cannot be built without distutils module]) -@@ -266,6 +267,7 @@ int main() - AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE]) + SWIG_PY_ERRMSG="no distutils found" +@@ -332,6 +333,7 @@ int main() + SWIG_RB_ERRMSG="" fi AC_SUBST(SWIG) + AC_SUBST(PYTHON_INCLUDES) |