Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

4 files changed, 21 insertions, 2 deletions

diff --git a/recipes/python/pyrtm_0.2.bb b/recipes/python/pyrtm_0.2.bb
new file mode 100644
index 0000000000..a5a6fb2e2f
--- /dev/null
+++ b/recipes/python/pyrtm_0.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Python interface for Remember The Milk API."
+AUTHOR = "Sridhar Ratnakumar / srid"
+HOMEPAGE = "http://pypi.python.org/pypi/pyrtm"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "python-native"
+PR = "r0"
+
+SRC_URI = "http://pypi.python.org/packages/source/p/pyrtm/pyrtm-${PV}.tar.gz"
+
+SRCNAME = "pyrtm"
+
+inherit distutils
+
+PACKAGE_ARCH = "all"
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
index 40d7a9eeca..918ffa2643 100644
--- a/recipes/python/python-pygobject-native_2.20.0.bb
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -11,6 +11,8 @@ SRC_URI = "\
 #  file://python-path.patch;patch=1 \
 "
 
+export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
+
 do_stage_append() {
 	install -d ${STAGING_BINDIR}
 	install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
index 2a07a4a1a4..10c94dcbc1 100644
--- a/recipes/python/python-pygobject_2.20.0.bb
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -20,6 +20,8 @@ inherit autotools distutils-base pkgconfig
 export BUILD_SYS
 export HOST_SYS
 
+export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
+
 do_stage() {
 	autotools_stage_all
 	install -d ${STAGING_LIBDIR}/../share/pygobject/
diff --git a/recipes/python/python_2.6.2.bb b/recipes/python/python_2.6.2.bb
index 2369a4b324..647f420dc7 100644
--- a/recipes/python/python_2.6.2.bb
+++ b/recipes/python/python_2.6.2.bb
@@ -69,7 +69,7 @@ do_compile() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-		OPT="${CFLAGS}"
+		RUNSHARED= OPT="${CFLAGS}"
 }
 
 do_stage() {
@@ -85,7 +85,7 @@ do_install() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-		DESTDIR=${D} LIBDIR=${libdir} install
+		DESTDIR=${D} LIBDIR=${libdir} RUNSHARED= install
 
 	install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}