summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/recipes-devtools/python/python-pycurl.inc31
-rw-r--r--meta/recipes-devtools/python/python-pycurl/no-static-link.patch17
-rw-r--r--meta/recipes-devtools/python/python-pycurl_7.21.5.bb3
-rw-r--r--meta/recipes-devtools/python/python3-pycurl_7.21.5.bb5
5 files changed, 0 insertions, 57 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index bbeb105a92..f36bd6fc44 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -331,7 +331,6 @@ DISTRO_PN_ALIAS_pn-python-distribute = "Opensuse=python-setuptools Fedora=python
331DISTRO_PN_ALIAS_pn-python-git = "Debian=python-git Fedora=GitPython" 331DISTRO_PN_ALIAS_pn-python-git = "Debian=python-git Fedora=GitPython"
332DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako" 332DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako"
333DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo" 333DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"
334DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl"
335DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject" 334DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject"
336DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" 335DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons"
337DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git" 336DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git"
diff --git a/meta/recipes-devtools/python/python-pycurl.inc b/meta/recipes-devtools/python/python-pycurl.inc
deleted file mode 100644
index d26318b6d2..0000000000
--- a/meta/recipes-devtools/python/python-pycurl.inc
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "Python bindings for libcurl"
2HOMEPAGE = "http://pycurl.sourceforge.net/"
3SECTION = "devel/python"
4LICENSE = "LGPLv2.1+ | MIT"
5LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \
6 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \
7 file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19"
8
9DEPENDS = "curl ${PYTHON_PN}"
10RDEPENDS_${PN} = "${PYTHON_PN}-core curl"
11SRCNAME = "pycurl"
12
13SRC_URI = "\
14 http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
15 file://no-static-link.patch \
16"
17
18SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717"
19SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0"
20S = "${WORKDIR}/${SRCNAME}-${PV}"
21
22BBCLASSEXTEND = "native"
23
24# Ensure the docstrings are generated as make clean will remove them
25do_compile_prepend() {
26 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings
27}
28
29do_install_append() {
30 rm -rf ${D}${datadir}/share
31}
diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
deleted file mode 100644
index 212779ca37..0000000000
--- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
4Signed-off-by: Maxin B. John <maxin.john@intel.com>
5---
6diff -Naur pycurl-7.19.5.2-orig/setup.py pycurl-7.19.5.2/setup.py
7--- pycurl-7.19.5.2-orig/setup.py 2015-11-02 15:42:24.000000000 +0200
8+++ pycurl-7.19.5.2/setup.py 2015-11-02 17:59:36.121527273 +0200
9@@ -154,7 +154,7 @@
10 optbuf = ''
11 sslhintbuf = ''
12 errtext = ''
13- for option in ["--libs", "--static-libs"]:
14+ for option in ["--libs"]:
15 p = subprocess.Popen((CURL_CONFIG, option),
16 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
17 stdout, stderr = p.communicate()
diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb
deleted file mode 100644
index eb70cea663..0000000000
--- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require python-pycurl.inc
2
3inherit distutils
diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb
deleted file mode 100644
index 5d11192ab6..0000000000
--- a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:"
2
3require python-pycurl.inc
4
5inherit distutils3