diff options
| -rw-r--r-- | meta/recipes-devtools/python/python-pycurl/no-static-link.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-pycurl_7.19.3.bb (renamed from meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb) | 10 |
2 files changed, 16 insertions, 14 deletions
diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch index e8c0005a77..907380f1ca 100644 --- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch +++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch | |||
| @@ -1,15 +1,17 @@ | |||
| 1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
| 2 | 2 | ||
| 3 | Index: pycurl-7.19.0.2/setup.py | 3 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> |
| 4 | |||
| 5 | Index: pycurl-7.19.3/setup.py | ||
| 4 | =================================================================== | 6 | =================================================================== |
| 5 | --- pycurl-7.19.0.2.orig/setup.py 2013-10-08 15:28:53.000000000 +0300 | 7 | --- pycurl-7.19.3.orig/setup.py 2014-01-10 08:04:40.000000000 +0200 |
| 6 | +++ pycurl-7.19.0.2/setup.py 2013-11-04 13:46:47.928292585 +0200 | 8 | +++ pycurl-7.19.3/setup.py 2014-02-04 15:09:08.411552887 +0200 |
| 7 | @@ -101,7 +101,7 @@ | 9 | @@ -211,7 +211,7 @@ |
| 8 | # support one or the other of these curl-config options, so gracefully | 10 | # If neither --libs nor --static-libs work, fail. |
| 9 | # tolerate failure of either, but not both. | ||
| 10 | optbuf = "" | 11 | optbuf = "" |
| 12 | errtext = '' | ||
| 11 | - for option in ["--libs", "--static-libs"]: | 13 | - for option in ["--libs", "--static-libs"]: |
| 12 | + for option in ["--libs"]: | 14 | + for option in ["--libs"]: |
| 13 | p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True, | 15 | p = subprocess.Popen((CURL_CONFIG, option), |
| 14 | stdout=subprocess.PIPE) | 16 | stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
| 15 | (stdout, stderr) = p.communicate() | 17 | stdout, stderr = p.communicate() |
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb b/meta/recipes-devtools/python/python-pycurl_7.19.3.bb index aceaab34cb..aee6cdda82 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.19.3.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "Python bindings for libcurl" | |||
| 2 | HOMEPAGE = "http://pycurl.sourceforge.net/" | 2 | HOMEPAGE = "http://pycurl.sourceforge.net/" |
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | LICENSE = "LGPLv2.1+ | MIT" | 4 | LICENSE = "LGPLv2.1+ | MIT" |
| 5 | LIC_FILES_CHKSUM = "file://README.rst;beginline=97;endline=111;md5=b5a5e531d80812bcbecbeb240fde63ef \ | 5 | LIC_FILES_CHKSUM = "file://README.rst;beginline=204;endline=219;md5=57e5ab0c0f964533fc59d93dec5695bb \ |
| 6 | file://COPYING;md5=3579a9fd0221d49a237aaa33492f988c \ | 6 | file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ |
| 7 | file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518" | 7 | file://COPYING-MIT;md5=e8200955c773b2a0fd6cea36ea5e87be" |
| 8 | 8 | ||
| 9 | DEPENDS = "curl python" | 9 | DEPENDS = "curl python" |
| 10 | RDEPENDS_${PN} = "python-core curl" | 10 | RDEPENDS_${PN} = "python-core curl" |
| @@ -15,8 +15,8 @@ SRC_URI = "\ | |||
| 15 | file://no-static-link.patch \ | 15 | file://no-static-link.patch \ |
| 16 | " | 16 | " |
| 17 | 17 | ||
| 18 | SRC_URI[archive.md5sum] = "518be33976dbc6838e42495ada64b43f" | 18 | SRC_URI[archive.md5sum] = "b9091b7438d3de1552e28862d2971cd1" |
| 19 | SRC_URI[archive.sha256sum] = "7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547" | 19 | SRC_URI[archive.sha256sum] = "05e48835fe445ff327dcd373f49d9970e0b828a07cd4d08a23264507a742d616" |
| 20 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 20 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
| 21 | 21 | ||
| 22 | inherit distutils | 22 | inherit distutils |
