diff options
Diffstat (limited to 'meta-python/recipes-devtools/python')
-rw-r--r-- | meta-python/recipes-devtools/python/python-pyzmq.inc (renamed from meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb) | 17 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch | 31 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb | 2 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb | 2 |
4 files changed, 23 insertions, 29 deletions
diff --git a/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb b/meta-python/recipes-devtools/python/python-pyzmq.inc index b5baf82df1..2447c2f34b 100644 --- a/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb +++ b/meta-python/recipes-devtools/python/python-pyzmq.inc @@ -1,16 +1,19 @@ SUMMARY = "Pyzmq provides Zero message queue access for the Python language" HOMEPAGE = "http://zeromq.org/bindings:python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e" +LICENSE = "BSD & LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ + file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" DEPENDS = "zeromq" -SRC_URI = "file://club-rpath-out.patch" -SRC_URI[md5sum] = "87e3abb33af5794db5ae85c667bbf324" -SRC_URI[sha256sum] = "77994f80360488e7153e64e5959dc5471531d1648e3a4bff14a714d074a38cc2" +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" -inherit pypi setuptools pkgconfig +SRC_URI += "file://club-rpath-out.patch" +SRC_URI[md5sum] = "aecdfc328193fbd81f6dc23228319943" +SRC_URI[sha256sum] = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4" -RDEPENDS_${PN} += "python-multiprocessing" +inherit pypi pkgconfig + +RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing" FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" diff --git a/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch index 2dc3b73f9e..936f165850 100644 --- a/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch +++ b/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch @@ -1,26 +1,13 @@ diff --git a/setup.py b/setup.py -index 62df445..1fdbdeb 100755 +index d243eaa..98099bc 100755 --- a/setup.py +++ b/setup.py -@@ -213,12 +213,6 @@ def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): - pass - # unused rpath args for OS X: - # settings['extra_link_args'] = ['-Wl,-rpath','-Wl,$ORIGIN/..'] -- else: -- settings['runtime_library_dirs'] += ['$ORIGIN/..'] -- elif sys.platform != 'darwin': -- settings['runtime_library_dirs'] += [ -- os.path.abspath(x) for x in settings['library_dirs'] -- ] - - return settings +@@ -192,8 +192,6 @@ def _add_rpath(settings, path): + """ + if sys.platform == 'darwin': + settings['extra_link_args'].extend(['-Wl,-rpath','-Wl,%s' % path]) +- else: +- settings['runtime_library_dirs'].append(path) -@@ -592,8 +586,6 @@ class Configure(build_ext): - pass - # unused rpath args for OS X: - # settings['extra_link_args'] = ['-Wl,-rpath','-Wl,$ORIGIN/../zmq'] -- else: -- settings['runtime_library_dirs'] = [ os.path.abspath(pjoin('.', 'zmq')) ] - - line() - info("Configure: Autodetecting ZMQ settings...") + def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): + """load appropriate library/include settings from ZMQ prefix""" diff --git a/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb b/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb new file mode 100644 index 0000000000..b690106bbb --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb @@ -0,0 +1,2 @@ +require python-pyzmq.inc +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb b/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb new file mode 100644 index 0000000000..050f53af14 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb @@ -0,0 +1,2 @@ +require python-pyzmq.inc +inherit setuptools3 |