]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-31904: remove libnet dependency from detect_socket() for VxWorks (GH-23394)
authorpxinwr <peixing.xin@windriver.com>
Sat, 28 Nov 2020 22:14:16 +0000 (06:14 +0800)
committerGitHub <noreply@github.com>
Sat, 28 Nov 2020 22:14:16 +0000 (14:14 -0800)
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.

Misc/NEWS.d/next/Build/2020-11-19-17-01-50.bpo-31904.894dk2.rst [new file with mode: 0644]
setup.py

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 (file)
index 0000000..d1ec647
--- /dev/null
@@ -0,0 +1 @@
+remove libnet dependency from detect_socket() for VxWorks
index 398d9251a6c41083377bf4c54497b87d2118079f..b7a7d26c5325bc53fc429b90b20ac18c3ad382da 100644 (file)
--- 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']