python-pycurl 7.16.4 update to 7.18.2; use dynamic linking

3 files changed, 25 insertions, 2 deletions

diff --git a/packages/python/python-pycurl/.mtn2git_empty b/packages/python/python-pycurl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pycurl/.mtn2git_empty
diff --git a/packages/python/python-pycurl/no-static-link.patch b/packages/python/python-pycurl/no-static-link.patch
new file mode 100644
index 0000000000..b7c5ab9c9c
--- /dev/null
+++ b/packages/python/python-pycurl/no-static-link.patch
@@ -0,0 +1,14 @@
+Index: pycurl-7.18.2/setup.py
+===================================================================
+--- pycurl-7.18.2.orig/setup.py
++++ pycurl-7.18.2/setup.py
+@@ -97,8 +97,7 @@ else:
+         else:
+             extra_compile_args.append(e)
+     libs = split_quoted(
+-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+-        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++        os.popen("'%s' --libs" % CURL_CONFIG).read())
+     for e in libs:
+         if e[:2] == "-l":
+             libraries.append(e[2:])
diff --git a/packages/python/python-pycurl_7.16.4.bb b/packages/python/python-pycurl_7.18.2.bb
index a9480ad949..406add10c8 100644
--- a/packages/python/python-pycurl_7.16.4.bb
+++ b/packages/python/python-pycurl_7.18.2.bb
@@ -2,11 +2,20 @@ DESCRIPTION = "libcurl Python Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core curl (>=${PV})"
 DEPENDS = "curl-${PV}"
 SRCNAME = "pycurl"
+PR = "ml0"
 
-SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+  http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
+  file://no-static-link.patch;patch=1 \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+do_install_append() {
+	mv -f ${D}${datadir}/share/* ${D}${datadir}/
+}
+
+RDEPENDS = "python-core curl (>=${PV})"