[oe-commits] org.oe.dev python-pygtk2: make it build on 64bit host for 32bit machine (from Poky)

[hrw commit]

python-pygtk2: make it build on 64bit host for 32bit machine (from Poky)

Informations why it is needed sent to mailing list.

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d92df12b19c3a9740bd99582f5b7044cc25f6316
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d92df12b19c3a9740bd99582f5b7044cc25f6316
Files:
1
packages/python/python-pygtk2/acinclude.m4
packages/python/python-pygtk2_2.10.3.bb
packages/python/python-pygtk2_2.6.3.bb
packages/python/python-pygtk2_2.8.6.bb
Diffs:

#
# mt diff -racb6fba6798df27ef82d9992d481a5bc09e1f37a -rd92df12b19c3a9740bd99582f5b7044cc25f6316
#
# 
# 
# patch "packages/python/python-pygtk2/acinclude.m4"
#  from [661a5030384fa69c238d6afa16e62ca085e973ea]
#    to [a88d00bee840b475039af1207dad53ea6337f513]
# 
# patch "packages/python/python-pygtk2_2.10.3.bb"
#  from [deb37f376d219c8eadc8f93bad3033f18498a080]
#    to [e9359304521f2017fa738bc1d6f870fb4ebe7ee0]
# 
# patch "packages/python/python-pygtk2_2.6.3.bb"
#  from [88dcbc0fe9d552f335cea90fbffbda03c63fdbf9]
#    to [1be92e01552c02565be9ae9cf68447f137a323db]
# 
# patch "packages/python/python-pygtk2_2.8.6.bb"
#  from [452343d5c6bfd36b28c93d94774324ac7f8cbc9f]
#    to [7400b30d2711bd9e8aab24ac7d3d77d3725f8438]
# 
============================================================
--- packages/python/python-pygtk2/acinclude.m4	661a5030384fa69c238d6afa16e62ca085e973ea
+++ packages/python/python-pygtk2/acinclude.m4	a88d00bee840b475039af1207dad53ea6337f513
@@ -43,12 +43,18 @@ dnl deduce PYTHON_INCLUDES
 [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-pygtk2_2.10.3.bb	deb37f376d219c8eadc8f93bad3033f18498a080
+++ packages/python/python-pygtk2_2.10.3.bb	e9359304521f2017fa738bc1d6f870fb4ebe7ee0
@@ -13,6 +13,7 @@ EXTRA_OECONF = "--disable-docs"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 EXTRA_OECONF = "--disable-docs"
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
 inherit autotools pkgconfig distutils-base
 
============================================================
--- packages/python/python-pygtk2_2.6.3.bb	88dcbc0fe9d552f335cea90fbffbda03c63fdbf9
+++ packages/python/python-pygtk2_2.6.3.bb	1be92e01552c02565be9ae9cf68447f137a323db
@@ -13,6 +13,8 @@ inherit autotools pkgconfig distutils-ba
 
 inherit autotools pkgconfig distutils-base
 
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}"
 FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \
 		    ${libdir}/python2.4/site-packages/gtk-2.0/.debug"
============================================================
--- packages/python/python-pygtk2_2.8.6.bb	452343d5c6bfd36b28c93d94774324ac7f8cbc9f
+++ packages/python/python-pygtk2_2.8.6.bb	7400b30d2711bd9e8aab24ac7d3d77d3725f8438
@@ -1,11 +1,11 @@ SECTION = "devel/python"
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
-# needs gtk+-2.8.x
+PRIORITY = "optional"
 DEPENDS = "gtk+ libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \
            file://acinclude.m4"
@@ -13,6 +13,8 @@ inherit autotools pkgconfig distutils-ba
 
 inherit autotools pkgconfig distutils-base
 
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }