-
-
Notifications
You must be signed in to change notification settings - Fork 478
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build/pkgs/pyzmq: Patch out broken rpath and version detection
- Loading branch information
Matthias Koeppe
committed
Nov 6, 2023
1 parent
ebd4db3
commit 2a5293c
Showing
2 changed files
with
49 additions
and
0 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
build/pkgs/pyzmq/patches/0001-setup.py-Remove-setting-of-rpath.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <[email protected]> | ||
Date: Sun, 5 Nov 2023 21:12:48 -0800 | ||
Subject: [PATCH 1/2] setup.py: Remove setting of rpath | ||
|
||
--- | ||
setup.py | 2 -- | ||
1 file changed, 2 deletions(-) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index d5c77a23..8a2a4943 100755 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None): | ||
settings['include_dirs'] += [pjoin(env, 'include')] | ||
settings['library_dirs'] += [pjoin(env, 'lib')] | ||
|
||
- for path in settings['library_dirs']: | ||
- _add_rpath(settings, os.path.abspath(path)) | ||
info(settings) | ||
|
||
return settings | ||
-- | ||
2.42.0 | ||
|
24 changes: 24 additions & 0 deletions
24
build/pkgs/pyzmq/patches/0002-setup.py-Patch-out-broken-version-detection.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <[email protected]> | ||
Date: Sun, 5 Nov 2023 21:35:29 -0800 | ||
Subject: [PATCH 2/2] setup.py: Patch out broken version detection | ||
|
||
--- | ||
setup.py | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index 8a2a4943..19d31654 100755 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -463,6 +463,7 @@ class Configure(build_ext): | ||
|
||
def check_zmq_version(self): | ||
"""check the zmq version""" | ||
+ return | ||
cfg = self.config | ||
# build test program | ||
zmq_prefix = cfg['zmq_prefix'] | ||
-- | ||
2.42.0 | ||
|