1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
Build for multiple python versions. Patch from Matthias Klose
<doko@debian.org> via Ubuntu. Mostly, rename libsvn_swig_py to
libsvn_swig_py2.x.
Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,6 +133,7 @@
APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
SWIG_PY_LINK = @SWIG_PY_LINK@
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
@@ -109,7 +109,8 @@
AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
])
- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+ PYTHON_INCLUDES="$ac_cv_python_includes"
+ 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])
@@ -289,6 +290,7 @@
AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
fi
AC_SUBST(SWIG)
+ AC_SUBST(PYTHON_INCLUDES)
AC_SUBST(SWIG_PY_INCLUDES)
AC_SUBST(SWIG_PY_COMPILE)
AC_SUBST(SWIG_PY_LINK)
--- a/build.conf
+++ b/build.conf
@@ -428,7 +428,7 @@
type = swig
path = subversion/bindings/swig
sources = core.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_diff libsvn_subr apr
description = Subversion core library bindings
include-runtime = yes
@@ -437,7 +437,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_client.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_client libsvn_subr apr
nonlibs = swig_core
description = Subversion client library bindings
@@ -446,7 +446,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_delta.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_delta libsvn_subr apr
nonlibs = swig_core
description = Subversion delta library bindings
@@ -455,7 +455,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_diff.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_diff libsvn_subr apr
nonlibs = swig_core
description = Subversion diff library bindings
@@ -464,7 +464,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_fs.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_fs libsvn_subr apr
nonlibs = swig_core
description = Subversion FS library bindings
@@ -473,7 +473,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_ra.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_ra libsvn_subr apr
nonlibs = swig_core
description = Subversion RA library bindings
@@ -482,7 +482,7 @@
type = swig
path = subversion/bindings/swig
sources = svn_repos.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_repos libsvn_subr apr
nonlibs = swig_core
description = Subversion repository library bindings
@@ -491,13 +491,13 @@
type = swig
path = subversion/bindings/swig
sources = svn_wc.i
-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
+libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
libsvn_wc libsvn_subr apr
nonlibs = swig_core
description = Subversion WC library bindings
# SWIG utility library for Python modules
-[libsvn_swig_py]
+[libsvn_swig_py$(PYVER)]
type = swig_lib
lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
|
