Package: subversion
Version: 1.7.5-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer,
This patch fixes issues related python multi-arch include problems.
This casues this package to FTBFS when building in Ubuntu raring.
* Fix python multi-arch includes issues.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-35-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u subversion-1.7.5/debian/changelog subversion-1.7.5/debian/changelog
diff -u subversion-1.7.5/debian/rules subversion-1.7.5/debian/rules
--- subversion-1.7.5/debian/rules
+++ subversion-1.7.5/debian/rules
@@ -64,6 +64,7 @@
set -e; for v in $(PYVERSIONS); do \
$(RM) $(PY_DIR); \
ln -fs python$$v $(PY_DIR); \
+ pyinc=$$(python$$v-config --includes); \
pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
$1; \
done
@@ -72,6 +73,7 @@
set -e; for v in $(PYVERSIONS); do \
$(RM) $(PY_DIR); \
ln -fs python$$v-dbg $(PY_DIR); \
+ pyinc=$$(python$$v-dbg-config --includes); \
pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
$1; \
done
@@ -204,7 +206,7 @@
$(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs))
$(call allpydbg, \
$(MAKE_B) $@ PYTHON=python$$v-dbg PYVER=$${v}_d \
- PYTHON_INCLUDES=-I/usr/include/python$${v}_d $(check_defs))
+ PYTHON_INCLUDES="$$pyinc" $(check_defs))
build-arch: debian/stamp-build-arch
debian/stamp-build-arch: debian/stamp-configure
@@ -220,11 +222,11 @@
$(DEB_BUILDDIR)/subversion/svn/svn --version > /dev/null
$(call allpy, \
$(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \
- PYTHON_INCLUDES=-I/usr/include/python$$v \
+ PYTHON_INCLUDES="$$pyinc" \
swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
$(call allpydbg, \
$(MAKE_B) swig-py PYTHON=python$$v PYVER=$${v}_d \
- PYTHON_INCLUDES=-I/usr/include/python$${v}_d \
+ PYTHON_INCLUDES="$$pyinc" \
EXTRA_SWIG_PY_CFLAGS=-O0 \
swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
ln -sf python$(PYDEFAULT) $(PY_DIR)
@@ -347,7 +349,7 @@
$(call allpydbg, \
$(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \
PYTHON=python$$v-dbg PYVER=$${v}_d \
- PYTHON_INCLUDES=-I/usr/include/python$${v}_d \
+ PYTHON_INCLUDES="$$pyinc" \
EXTRA_SWIG_PY_CFLAGS=-O0 \
swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
for i in $$(find debian/tmp/usr/lib/python* -name '*.so'); do \
