| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 1 | From efae4e08d13e0958d929ea524e21c0a210b31982 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 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> |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 11 | |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 12 | --- |
| 13 | setup.py | 3 --- |
| 14 | 1 file changed, 3 deletions(-) |
| 15 | |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 16 | diff --git a/setup.py b/setup.py |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 17 | index b634d94..7f6a2f1 100755 |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 18 | --- a/setup.py |
| 19 | +++ b/setup.py |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 20 | @@ -235,9 +235,6 @@ def _add_rpath(settings, path): |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | """ |
| 22 | if sys.platform == 'darwin': |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 23 | settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | - else: |
| 25 | - settings['runtime_library_dirs'].append(path) |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 26 | - |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 27 | |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 28 | def settings_from_prefix(prefix=None): |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | """load appropriate library/include settings from ZMQ prefix""" |