diff options
Diffstat (limited to 'meta-python')
| -rw-r--r-- | meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch | 24 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-pyzmq_21.0.1.bb (renamed from meta-python/recipes-devtools/python/python3-pyzmq_20.0.0.bb) | 2 |
2 files changed, 22 insertions, 4 deletions
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 936f165850..d4e144a610 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 @@ | |||
| 1 | From b394003d31a7187767b7d6cc7b871968d2674be9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leon Anavi <leon.anavi@konsulko.com> | ||
| 3 | Date: Fri, 22 Jan 2021 11:41:12 +0200 | ||
| 4 | Subject: [PATCH] setup.py: Adjust _add_rpath | ||
| 5 | |||
| 6 | Fix error: unrecognized command-line option '-R' | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [oe specific] | ||
| 9 | |||
| 10 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
| 11 | --- | ||
| 12 | setup.py | 3 --- | ||
| 13 | 1 file changed, 3 deletions(-) | ||
| 14 | |||
| 1 | diff --git a/setup.py b/setup.py | 15 | diff --git a/setup.py b/setup.py |
| 2 | index d243eaa..98099bc 100755 | 16 | index 22f582d..2d28655 100755 |
| 3 | --- a/setup.py | 17 | --- a/setup.py |
| 4 | +++ b/setup.py | 18 | +++ b/setup.py |
| 5 | @@ -192,8 +192,6 @@ def _add_rpath(settings, path): | 19 | @@ -231,9 +231,6 @@ def _add_rpath(settings, path): |
| 6 | """ | 20 | """ |
| 7 | if sys.platform == 'darwin': | 21 | if sys.platform == 'darwin': |
| 8 | settings['extra_link_args'].extend(['-Wl,-rpath','-Wl,%s' % path]) | 22 | settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) |
| 9 | - else: | 23 | - else: |
| 10 | - settings['runtime_library_dirs'].append(path) | 24 | - settings['runtime_library_dirs'].append(path) |
| 25 | - | ||
| 11 | 26 | ||
| 12 | def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): | 27 | def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): |
| 13 | """load appropriate library/include settings from ZMQ prefix""" | 28 | """load appropriate library/include settings from ZMQ prefix""" |
| 29 | -- | ||
| 30 | 2.17.1 | ||
| 31 | |||
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 index a668eb11e2..d6b7414608 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" | |||
| 8 | FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" | 8 | FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" |
| 9 | 9 | ||
| 10 | SRC_URI += "file://club-rpath-out.patch" | 10 | SRC_URI += "file://club-rpath-out.patch" |
| 11 | SRC_URI[sha256sum] = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9" | 11 | SRC_URI[sha256sum] = "c3a630dd7716e8e127d43b22598e256a2d11a847b8cc3310350528960037fa06" |
| 12 | 12 | ||
| 13 | inherit pypi pkgconfig setuptools3 | 13 | inherit pypi pkgconfig setuptools3 |
| 14 | 14 | ||
