[oe-commits] org.oe.dev merge of '1479b8771eb7ed5d675e3c565d67c40c2030888c'

[hrw commit]

merge of '1479b8771eb7ed5d675e3c565d67c40c2030888c'
     and 'a81be4a9e6a337df1765dd0899498f17ec68c272'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3749ce8294a43abc3797bff9e431e3c309e9847c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3749ce8294a43abc3797bff9e431e3c309e9847c
Files:
1
conf/machine/gumstix.conf
conf/machine/include/gumstix.inc
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
packages/python/python-dbus/python-path.patch
MAINTAINERS
packages/python/python-dbus_0.81.1.bb
Diffs:

#
# mt diff -r1479b8771eb7ed5d675e3c565d67c40c2030888c -r3749ce8294a43abc3797bff9e431e3c309e9847c
#
# 
# 
# rename "conf/machine/gumstix.conf"
#     to "conf/machine/include/gumstix.inc"
# 
# add_file "conf/machine/gumstix-connex.conf"
#  content [c2753f863ed4d3ad245786a5920bcd5d726d443d]
# 
# add_file "conf/machine/gumstix-verdex.conf"
#  content [9f72c4825ce08721741755a383e35f560b795f2e]
# 
============================================================
--- conf/machine/gumstix-connex.conf	c2753f863ed4d3ad245786a5920bcd5d726d443d
+++ conf/machine/gumstix-connex.conf	c2753f863ed4d3ad245786a5920bcd5d726d443d
@@ -0,0 +1,2 @@
+require conf/machine/include/gumstix.conf
+
============================================================
--- conf/machine/gumstix-verdex.conf	9f72c4825ce08721741755a383e35f560b795f2e
+++ conf/machine/gumstix-verdex.conf	9f72c4825ce08721741755a383e35f560b795f2e
@@ -0,0 +1,4 @@
+require conf/machine/include/gumstix.conf
+
+PACKAGE_EXTRA_ARCHS += " iwmmxt "
+


#
# mt diff -ra81be4a9e6a337df1765dd0899498f17ec68c272 -r3749ce8294a43abc3797bff9e431e3c309e9847c
#
# 
# 
# add_file "packages/python/python-dbus/python-path.patch"
#  content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
# 
# patch "MAINTAINERS"
#  from [6d6d2143443bc57017864bfbfe353d4f1b8258b6]
#    to [78ace1245c132c22dcfc3a54a4a76692d9d0259a]
# 
# 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"
============================================================
--- MAINTAINERS	6d6d2143443bc57017864bfbfe353d4f1b8258b6
+++ MAINTAINERS	78ace1245c132c22dcfc3a54a4a76692d9d0259a
@@ -124,10 +124,10 @@ Mail:       hrw at openembedded.org
 
 Person:     Marcin Juszkiewicz
 Mail:       hrw at openembedded.org
-Website:    http://www.hrw.one.pl/
-Machines:   collie, tosa, progear
-Distros:    OpenZaurus, celinux-test
-Interests:  WiFi, Opie, Qtopia fonts, Native SDK
+Website:    http://blog.haerwu.biz/
+Machines:   collie, tosa, progear, alix
+Distros:    Poky, OpenZaurus, Ångström
+Interests:  WiFi, Native SDK
 Recipes:    linux, hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps
 Recipes:    linux-rp, gammu
 Recipes:    ttf-fonts/* 
============================================================
--- 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}/../"
+