From: pxinwr <peixing.xin@windriver.com>
Date: Sat, 28 Nov 2020 22:14:16 +0000 (+0800)
Subject: bpo-31904: remove libnet dependency from detect_socket() for VxWorks (GH-23394)
X-Git-Tag: v3.10.0a3~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00a6568ba37f0d815289776a51af46d0eac27384;p=thirdparty%2FPython%2Fcpython.git

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.
---

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 000000000000..d1ec647ed343
--- /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 398d9251a6c4..b7a7d26c5325 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']