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 936f16585..d4e144a61 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,13 +1,31 @@ +From b394003d31a7187767b7d6cc7b871968d2674be9 Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Fri, 22 Jan 2021 11:41:12 +0200 +Subject: [PATCH] setup.py: Adjust _add_rpath + +Fix error: unrecognized command-line option '-R' + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Leon Anavi +--- + setup.py | 3 --- + 1 file changed, 3 deletions(-) + diff --git a/setup.py b/setup.py -index d243eaa..98099bc 100755 +index 22f582d..2d28655 100755 --- a/setup.py +++ b/setup.py -@@ -192,8 +192,6 @@ def _add_rpath(settings, path): +@@ -231,9 +231,6 @@ def _add_rpath(settings, path): """ if sys.platform == 'darwin': - settings['extra_link_args'].extend(['-Wl,-rpath','-Wl,%s' % path]) + settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) - else: - settings['runtime_library_dirs'].append(path) +- def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): """load appropriate library/include settings from ZMQ prefix""" +-- +2.17.1 + diff --git a/meta-python/recipes-devtools/python/python3-pyzmq_20.0.0.bb b/meta-python/recipes-devtools/python/python3-pyzmq_21.0.1.bb similarity index 91% rename from meta-python/recipes-devtools/python/python3-pyzmq_20.0.0.bb rename to meta-python/recipes-devtools/python/python3-pyzmq_21.0.1.bb index a668eb11e..d6b741460 100644 --- a/meta-python/recipes-devtools/python/python3-pyzmq_20.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyzmq_21.0.1.bb @@ -8,7 +8,7 @@ DEPENDS = "zeromq" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" SRC_URI += "file://club-rpath-out.patch" -SRC_URI[sha256sum] = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9" +SRC_URI[sha256sum] = "c3a630dd7716e8e127d43b22598e256a2d11a847b8cc3310350528960037fa06" inherit pypi pkgconfig setuptools3