diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-11-05 11:25:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-05 22:17:56 +0000 |
commit | 16d18ef11381ba18b3ef638c502ab38bcf9d7f1c (patch) | |
tree | 0f25aba8262bbe4ba460a3ccfa0acc87732f3447 /meta/recipes-devtools/python | |
parent | b353269498d505e949446b3c8a7d4a4dc0396f6f (diff) | |
download | poky-16d18ef11381ba18b3ef638c502ab38bcf9d7f1c.tar.gz |
python-pycurl: upgrade to 7.19.0.2
Refreshed no-static-link.patch to work with this release and changed the
lines/checksum (and the file) where the license can be found.
(From OE-Core rev: beaa98867954898f75c8a0987218a2caffb8daba)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r-- | meta/recipes-devtools/python/python-pycurl/no-static-link.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb (renamed from meta/recipes-devtools/python/python-pycurl_7.19.0.bb) | 7 |
2 files changed, 15 insertions, 17 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 c97f5dc029..e8c0005a77 100644 --- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch +++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch | |||
@@ -1,16 +1,15 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | Index: pycurl-7.18.2/setup.py | 3 | Index: pycurl-7.19.0.2/setup.py |
4 | =================================================================== | 4 | =================================================================== |
5 | --- pycurl-7.18.2.orig/setup.py | 5 | --- pycurl-7.19.0.2.orig/setup.py 2013-10-08 15:28:53.000000000 +0300 |
6 | +++ pycurl-7.18.2/setup.py | 6 | +++ pycurl-7.19.0.2/setup.py 2013-11-04 13:46:47.928292585 +0200 |
7 | @@ -97,8 +97,7 @@ else: | 7 | @@ -101,7 +101,7 @@ |
8 | else: | 8 | # support one or the other of these curl-config options, so gracefully |
9 | extra_compile_args.append(e) | 9 | # tolerate failure of either, but not both. |
10 | libs = split_quoted( | 10 | optbuf = "" |
11 | - os.popen("'%s' --libs" % CURL_CONFIG).read()+\ | 11 | - for option in ["--libs", "--static-libs"]: |
12 | - os.popen("'%s' --static-libs" % CURL_CONFIG).read()) | 12 | + for option in ["--libs"]: |
13 | + os.popen("'%s' --libs" % CURL_CONFIG).read()) | 13 | p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True, |
14 | for e in libs: | 14 | stdout=subprocess.PIPE) |
15 | if e[:2] == "-l": | 15 | (stdout, stderr) = p.communicate() |
16 | libraries.append(e[2:]) | ||
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb index 122e1bdedc..fb57b49a93 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb | |||
@@ -2,22 +2,21 @@ DESCRIPTION = "libcurl python bindings." | |||
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;endline=13;md5=fbfe545b1869617123a08c0983ef17b2 \ | 5 | LIC_FILES_CHKSUM = "file://README.rst;beginline=97;endline=111;md5=b5a5e531d80812bcbecbeb240fde63ef \ |
6 | file://COPYING;md5=3579a9fd0221d49a237aaa33492f988c \ | 6 | file://COPYING;md5=3579a9fd0221d49a237aaa33492f988c \ |
7 | file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518" | 7 | file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518" |
8 | 8 | ||
9 | DEPENDS = "curl python" | 9 | DEPENDS = "curl python" |
10 | RDEPENDS_${PN} = "python-core curl" | 10 | RDEPENDS_${PN} = "python-core curl" |
11 | SRCNAME = "pycurl" | 11 | SRCNAME = "pycurl" |
12 | PR = "r3" | ||
13 | 12 | ||
14 | SRC_URI = "\ | 13 | SRC_URI = "\ |
15 | http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ | 14 | http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ |
16 | file://no-static-link.patch \ | 15 | file://no-static-link.patch \ |
17 | " | 16 | " |
18 | 17 | ||
19 | SRC_URI[archive.md5sum] = "919d58fe37e69fe87ce4534d8b6a1c7b" | 18 | SRC_URI[archive.md5sum] = "518be33976dbc6838e42495ada64b43f" |
20 | SRC_URI[archive.sha256sum] = "eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642" | 19 | SRC_URI[archive.sha256sum] = "7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547" |
21 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 20 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
22 | 21 | ||
23 | inherit distutils | 22 | inherit distutils |