diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-23 11:31:26 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-23 11:31:26 +0000 |
| commit | 3b3f3e9a941121bba91ce0bcacc1c0cb1bda0223 (patch) | |
| tree | aa956821661041e40e14a6bda7c86f872bee4021 | |
| parent | d9eb64a436c4ddfe30ba5454d1becd765c3cb7d5 (diff) | |
| parent | 9fbbb5505d79a4aa4acbba1e61898f5adcf00f85 (diff) | |
merge of 'a81be4a9e6a337df1765dd0899498f17ec68c272'
and 'bb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4'
| -rw-r--r-- | packages/python/python-dbus/python-path.patch | 21 | ||||
| -rw-r--r-- | packages/python/python-dbus_0.81.1.bb | 8 |
2 files changed, 27 insertions, 2 deletions
diff --git a/packages/python/python-dbus/python-path.patch b/packages/python/python-dbus/python-path.patch new file mode 100644 index 0000000000..6bdbd19d03 --- /dev/null +++ b/packages/python/python-dbus/python-path.patch @@ -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" diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.81.1.bb index 82b9c390ca..ad3b1c177b 100644 --- a/packages/python/python-dbus_0.81.1.bb +++ b/packages/python/python-dbus_0.81.1.bb @@ -4,11 +4,15 @@ 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}/../" + |