python-pyzmq: update to 23.0.0

This commit is contained in:
Biswapriyo Nath
2022-06-01 19:25:21 +05:30
parent 0d9dfc68b9
commit b3d3d44bc8
2 changed files with 24 additions and 15 deletions

View File

@@ -1,25 +1,34 @@
diff --git a/setup.py b/setup.py
index e5ad7b9..007981e 100755
index 049771d..619588c 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@ import time
import errno
import platform
@@ -30,6 +30,7 @@ from os.path import join as pjoin
from subprocess import PIPE, CalledProcessError, Popen, check_call
from sysconfig import get_config_var
from traceback import print_exc
+from sysconfig import _POSIX_BUILD
try:
import cffi
@@ -170,7 +171,7 @@ def bundled_settings(debug):
from packaging.version import Version as V
from setuptools import Command, setup
@@ -152,7 +153,7 @@ def bundled_settings(cmd):
# is this necessary?
if sys.platform.startswith('freebsd'):
settings['libraries'].append('pthread')
- elif sys.platform.startswith('win'):
+ elif sys.platform.startswith('win') and not _POSIX_BUILD:
# link against libzmq in build dir:
plat = distutils.util.get_platform()
temp = 'temp.%s-%i.%i' % (plat, sys.version_info[0], sys.version_info[1])
@@ -534,7 +535,7 @@ class Configure(build_ext):
if sys.version_info < (3, 9, 2):
# bpo-39825: EXT_SUFFIX is wrong from sysconfig prior to 3.9.2 / 3.8.7
@@ -355,7 +356,7 @@ class Configure(build_ext):
merge(self.config, config_from_prefix(self.zmq))
# ensure vcredist is on PATH
- if sys.platform.startswith("win"):
+ if sys.platform.startswith("win") and 'MSC' in sys.version:
locate_vcredist_dir(self.plat_name)
# need a dummy extension for run to set up a compiler
self.extensions = [Extension("fake", ["unused.c"])]
@@ -514,7 +515,7 @@ class Configure(build_ext):
)
line()
@@ -28,7 +37,7 @@ index e5ad7b9..007981e 100755
# fetch libzmq.dll into local dir
local_dll = localpath('zmq', libzmq_name + '.dll')
if not zmq_prefix and not os.path.exists(local_dll):
@@ -626,7 +627,7 @@ class Configure(build_ext):
@@ -606,7 +607,7 @@ class Configure(build_ext):
libzmq.define_macros.append(('ZMQ_IOTHREADS_USE_POLL', 1))
libzmq.define_macros.append(('ZMQ_POLL_BASED_ON_POLL', 1))