summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpxinwr <peixing.xin@windriver.com>2020-11-29 06:14:16 +0800
committerGitHub <noreply@github.com>2020-11-28 14:14:16 -0800
commit00a6568ba37f0d815289776a51af46d0eac27384 (patch)
tree97f32d9f55bdae40f0fe7b69592a00aa7a0ba71c
parent6a273fdc2a36f52fb70359149eff014f1b6b08d4 (diff)
downloadcpython-git-00a6568ba37f0d815289776a51af46d0eac27384.tar.gz
bpo-31904: remove libnet dependency from detect_socket() for VxWorks (GH-23394)
Previously on VxWorks compiling socket extension module needs the libnet to link. Now VxWorks has moved the replied functions to libc. So removing libnet from setup.py.
-rw-r--r--Misc/NEWS.d/next/Build/2020-11-19-17-01-50.bpo-31904.894dk2.rst1
-rw-r--r--setup.py6
2 files changed, 2 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Build/2020-11-19-17-01-50.bpo-31904.894dk2.rst b/Misc/NEWS.d/next/Build/2020-11-19-17-01-50.bpo-31904.894dk2.rst
new file mode 100644
index 0000000000..d1ec647ed3
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-11-19-17-01-50.bpo-31904.894dk2.rst
@@ -0,0 +1 @@
+remove libnet dependency from detect_socket() for VxWorks
diff --git a/setup.py b/setup.py
index 398d9251a6..b7a7d26c53 100644
--- a/setup.py
+++ b/setup.py
@@ -1132,11 +1132,7 @@ class PyBuildExt(build_ext):
def detect_socket(self):
# socket(2)
kwargs = {'depends': ['socketmodule.h']}
- if VXWORKS:
- if not self.compiler.find_library_file(self.lib_dirs, 'net'):
- return
- kwargs['libraries'] = ['net']
- elif MACOS:
+ if MACOS:
# Issue #35569: Expose RFC 3542 socket options.
kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']