From 625e1e58d006938396c826dc9de56b0d0ca308a9 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 19 Jul 2018 09:25:01 +0200 Subject: python-pyzmq, python3-pyzmq: update to 17.1.0 Also the package is licensed under both BSD and LGPL-3.0. This the license checksum was updated to reflect this. Signed-off-by: Pascal Bach Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-pyzmq.inc | 27 +++++++++++++++++++ .../python/python-pyzmq/club-rpath-out.patch | 31 +++++++--------------- .../recipes-devtools/python/python-pyzmq_14.7.0.bb | 24 ----------------- .../recipes-devtools/python/python-pyzmq_17.1.0.bb | 2 ++ .../python/python3-pyzmq_17.1.0.bb | 2 ++ 5 files changed, 40 insertions(+), 46 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python-pyzmq.inc delete mode 100644 meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb create mode 100644 meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python-pyzmq.inc b/meta-python/recipes-devtools/python/python-pyzmq.inc new file mode 100644 index 0000000000..2447c2f34b --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyzmq.inc @@ -0,0 +1,27 @@ +SUMMARY = "Pyzmq provides Zero message queue access for the Python language" +HOMEPAGE = "http://zeromq.org/bindings:python" +LICENSE = "BSD & LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ + file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" +DEPENDS = "zeromq" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" + +SRC_URI += "file://club-rpath-out.patch" +SRC_URI[md5sum] = "aecdfc328193fbd81f6dc23228319943" +SRC_URI[sha256sum] = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4" + +inherit pypi pkgconfig + +RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing" + +FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" + +do_compile_prepend() { + echo [global] > ${S}/setup.cfg + echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg + echo have_sys_un_h = True >> ${S}/setup.cfg + echo skip_check_zmq = True >> ${S}/setup.cfg + echo libzmq_extension = False >> ${S}/setup.cfg + echo no_libzmq_extension = True >> ${S}/setup.cfg +} 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_14.7.0.bb b/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb deleted file mode 100644 index b5baf82df1..0000000000 --- a/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -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" -DEPENDS = "zeromq" - -SRC_URI = "file://club-rpath-out.patch" -SRC_URI[md5sum] = "87e3abb33af5794db5ae85c667bbf324" -SRC_URI[sha256sum] = "77994f80360488e7153e64e5959dc5471531d1648e3a4bff14a714d074a38cc2" - -inherit pypi setuptools pkgconfig - -RDEPENDS_${PN} += "python-multiprocessing" - -FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" - -do_compile_prepend() { - echo [global] > ${S}/setup.cfg - echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg - echo have_sys_un_h = True >> ${S}/setup.cfg - echo skip_check_zmq = True >> ${S}/setup.cfg - echo libzmq_extension = False >> ${S}/setup.cfg - echo no_libzmq_extension = True >> ${S}/setup.cfg -} 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 -- cgit 1.2.3-korg