[oe-commits] org.oe.dev python-dbus: make it build on amd64

[hrw commit]

python-dbus: make it build on amd64

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 9ffaf3c87a0ed022e4d1a5278dd3fa333a996305
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9ffaf3c87a0ed022e4d1a5278dd3fa333a996305
Files:
1
packages/python/python-dbus/python-path.patch
packages/python/python-dbus_0.81.1.bb
Diffs:

#
# mt diff -r62f43ef2955b9032c28da638a32780b667fd7501 -r9ffaf3c87a0ed022e4d1a5278dd3fa333a996305
#
# 
# 
# add_file "packages/python/python-dbus/python-path.patch"
#  content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
# 
# patch "packages/python/python-dbus_0.81.1.bb"
#  from [5bfcd82edc7fda46c67b545945bde583f85b9f45]
#    to [f5cd93db72bf6173350f548037e52ecb2b42cd60]
# 
============================================================
--- packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
+++ packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
@@ -0,0 +1,21 @@
+--- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4
++++ dbus-python-0.81.1/m4/am-check-python-headers.m4
+@@ -7214,12 +7214,18 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
++AC_ARG_WITH(python-includes,
++	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++if test x$py_exec_prefix != x; then
++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++else
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
============================================================
--- packages/python/python-dbus_0.81.1.bb	5bfcd82edc7fda46c67b545945bde583f85b9f45
+++ packages/python/python-dbus_0.81.1.bb	f5cd93db72bf6173350f548037e52ecb2b42cd60
@@ -1,14 +1,18 @@ RDEPENDS = "dbus python-threading python
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
 RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
-           file://allow-older-autotools.patch;patch=1"
+           file://allow-older-autotools.patch;patch=1 \
+	   file://python-path.patch;patch=1"
+
 S = "${WORKDIR}/dbus-python-${PV}"
 
 inherit distutils-base autotools
 
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+