From: doko@ubuntu.com <doko@ubuntu.com>
Date: Sat, 4 Jun 2016 23:38:29 +0000 (+0200)
Subject: - Issue #21277: Don't try to link _ctypes with a ffi_convenience library.
X-Git-Tag: v3.6.0a2~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae683657b708b38b6ddff4afeb1d21fc908d67d0;p=thirdparty%2FPython%2Fcpython.git

- Issue #21277: Don't try to link _ctypes with a ffi_convenience library.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 4b82ccd2dc78..f0d200832a24 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1290,6 +1290,8 @@ Tests
 Build
 -----
 
+- Issue #21277: Don't try to link _ctypes with a ffi_convenience library.
+
 - Issue #26884: Fix linking extension modules for cross builds.
   Patch by Xavier de Gaye.
 
diff --git a/setup.py b/setup.py
index 636dd09fab35..006ecdddb492 100644
--- a/setup.py
+++ b/setup.py
@@ -2007,7 +2007,7 @@ class PyBuildExt(build_ext):
                         break
         ffi_lib = None
         if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
+            for lib_name in ('ffi', 'ffi_pic'):
                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
                     ffi_lib = lib_name
                     break