diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:04:38 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
| commit | b48b7b4109868a8c0ddda090992e936e821c7ea6 (patch) | |
| tree | 696be8ea782f2548c0f63bb0188f4c8d3eeed681 /import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq | |
| parent | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (diff) | |
| download | talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.tar.gz talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.zip | |
Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq')
| -rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch new file mode 100644 index 000000000..2dc3b73f9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch @@ -0,0 +1,26 @@ +diff --git a/setup.py b/setup.py +index 62df445..1fdbdeb 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 + +@@ -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...") |
