diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-20 21:27:05 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-20 21:27:31 +0200 |
| commit | 1fe360476e690c4ee5fd61248ac5b1e256d83064 (patch) | |
| tree | da0072e0d84f53aa1d3fe9420e9273f6283907fb /patches/pyzmq-14.1.0 | |
| parent | d429b84d6559c0e31cf45c453968ac9caee72aa3 (diff) | |
| download | ptxdist-1fe360476e690c4ee5fd61248ac5b1e256d83064.tar.gz ptxdist-1fe360476e690c4ee5fd61248ac5b1e256d83064.tar.xz | |
pyzmq: add workaround to avoid rpath with sysroot
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/pyzmq-14.1.0')
| -rw-r--r-- | patches/pyzmq-14.1.0/0001-HACK-setup.py-avoid-rpath-with-sysroot.patch | 24 | ||||
| -rw-r--r-- | patches/pyzmq-14.1.0/series | 4 |
2 files changed, 28 insertions, 0 deletions
diff --git a/patches/pyzmq-14.1.0/0001-HACK-setup.py-avoid-rpath-with-sysroot.patch b/patches/pyzmq-14.1.0/0001-HACK-setup.py-avoid-rpath-with-sysroot.patch new file mode 100644 index 000000000..3df3af6d5 --- /dev/null +++ b/patches/pyzmq-14.1.0/0001-HACK-setup.py-avoid-rpath-with-sysroot.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sat, 20 May 2017 19:05:18 +0200 +Subject: [PATCH] HACK: setup.py: avoid rpath with sysroot + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + setup.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 6cb58a3fedd9..ca348f89fd50 100755 +--- a/setup.py ++++ b/setup.py +@@ -217,10 +217,6 @@ def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): + # 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 + diff --git a/patches/pyzmq-14.1.0/series b/patches/pyzmq-14.1.0/series new file mode 100644 index 000000000..6404f91be --- /dev/null +++ b/patches/pyzmq-14.1.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-HACK-setup.py-avoid-rpath-with-sysroot.patch +# 70c3d355f2a155d9a0207f0f2f054e39 - git-ptx-patches magic |