Package: unbound
Version: 1.4.19-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu raring ubuntu-patch multiarch
A simple addition in the acx_python.m4 file allows this package to build with
python multiarch headers. I removed the single-debian-patch option to make
this a disparate change, but feel free to ignore that part of the diff.
*** /tmp/tmpQOtvso/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
* Include python multiarch path in CPPFLAGS; Fixes FTBFS
- add debian/patches/fix-python-multiarch.patch
- update debian/patches/series
* Remove source options as it only contains 'single-debian-patch' since we
should have the Ubuntu changes separate from the Debian changes
- drop debian/source/options
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-proposed'), (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 -Nru unbound-1.4.19/debian/changelog unbound-1.4.19/debian/changelog
diff -Nru unbound-1.4.19/debian/control unbound-1.4.19/debian/control
diff -Nru unbound-1.4.19/debian/patches/fix-python-multiarch.patch unbound-1.4.19/debian/patches/fix-python-multiarch.patch
--- unbound-1.4.19/debian/patches/fix-python-multiarch.patch 1969-12-31 18:00:00.000000000 -0600
+++ unbound-1.4.19/debian/patches/fix-python-multiarch.patch 2013-01-07 00:31:40.000000000 -0600
@@ -0,0 +1,19 @@
+Description: Include python multiarch header path
+Author: Micah Gersten <[email protected]>
+
+--- unbound-1.4.19.orig/acx_python.m4
++++ unbound-1.4.19/acx_python.m4
+@@ -90,7 +90,12 @@ $ac_distutils_result])
+ if test -n "${python_path}"; then
+ python_path="-I$python_path"
+ fi
+- PYTHON_CPPFLAGS=$python_path
++ python_multiarch_path=`$PYTHON -c "import distutils.sysconfig; \
++ print distutils.sysconfig.get_python_inc(plat_specific=1);"`
++ if test -n "${python_multiarch_path}"; then
++ python_multiarch_path="-I$python_multiarch_path"
++ fi
++ PYTHON_CPPFLAGS="$python_path $python_multiarch_path"
+ fi
+ AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+ AC_SUBST([PYTHON_CPPFLAGS])
diff -Nru unbound-1.4.19/debian/patches/series unbound-1.4.19/debian/patches/series
--- unbound-1.4.19/debian/patches/series 2012-12-14 20:35:48.000000000 -0600
+++ unbound-1.4.19/debian/patches/series 2013-01-07 00:32:13.000000000 -0600
@@ -1 +1,2 @@
debian-changes
+fix-python-multiarch.patch
diff -Nru unbound-1.4.19/debian/source/options unbound-1.4.19/debian/source/options
--- unbound-1.4.19/debian/source/options 2012-12-14 20:34:01.000000000 -0600
+++ unbound-1.4.19/debian/source/options 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-single-debian-patch
