Skip to content

Commit 2a5293c

Browse files
author
Matthias Koeppe
committed
build/pkgs/pyzmq: Patch out broken rpath and version detection
1 parent ebd4db3 commit 2a5293c

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:12:48 -0800
4+
Subject: [PATCH 1/2] setup.py: Remove setting of rpath
5+
6+
---
7+
setup.py | 2 --
8+
1 file changed, 2 deletions(-)
9+
10+
diff --git a/setup.py b/setup.py
11+
index d5c77a23..8a2a4943 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None):
15+
settings['include_dirs'] += [pjoin(env, 'include')]
16+
settings['library_dirs'] += [pjoin(env, 'lib')]
17+
18+
- for path in settings['library_dirs']:
19+
- _add_rpath(settings, os.path.abspath(path))
20+
info(settings)
21+
22+
return settings
23+
--
24+
2.42.0
25+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:35:29 -0800
4+
Subject: [PATCH 2/2] setup.py: Patch out broken version detection
5+
6+
---
7+
setup.py | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/setup.py b/setup.py
11+
index 8a2a4943..19d31654 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -463,6 +463,7 @@ class Configure(build_ext):
15+
16+
def check_zmq_version(self):
17+
"""check the zmq version"""
18+
+ return
19+
cfg = self.config
20+
# build test program
21+
zmq_prefix = cfg['zmq_prefix']
22+
--
23+
2.42.0
24+

0 commit comments

Comments
 (0)