From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Sat, 10 Dec 2016 16:34:46 +0000 (+0100)
Subject: Issue #28849: Merge 3.6.
X-Git-Tag: v3.7.0a1~1774
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ca2b10213b4a5727dc99521c1b07ba75f3c321b;p=python
Issue #28849: Merge 3.6.
---
5ca2b10213b4a5727dc99521c1b07ba75f3c321b
diff --cc Lib/test/test_sysconfig.py
index d2aa8b4d61,747b2e5815..a3baea86fe
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@@ -385,10 -385,10 +385,11 @@@ class TestSysConfig(unittest.TestCase)
self.assertIsNotNone(vars['SO'])
self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
- @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
+ @unittest.skipUnless(hasattr(sys.implementation, '_multiarch'),
+ 'multiarch-specific test')
def test_triplet_in_ext_suffix(self):
- import ctypes, platform, re
+ ctypes = import_module('ctypes')
+ import platform, re
machine = platform.machine()
suffix = sysconfig.get_config_var('EXT_SUFFIX')
if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine):
diff --cc Misc/NEWS
index 7358713388,5c323a1038..846b394090
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -528,27 -613,6 +528,29 @@@ Documentatio
Build
-----
++- Issue #28849: Do not define sys.implementation._multiarch on Android.
++
+- Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and
+ Michael Haubenwallner.
+
+- Issue #26359: Rename --with-optimiations to --enable-optimizations.
+
+- Issue #28444: Fix missing extensions modules when cross compiling.
+
+- Issue #28208: Update Windows build and OS X installers to use SQLite 3.14.2.
+
+- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
+
+- Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
+ instead of ``&PyType_Type`` to PyVarObject_HEAD_INIT. Patch by Masayuki
+ Yamamoto.
+
+- Issue #13756: Fix building extensions modules on Cygwin. Patch by Roumen
+ Petrov, based on original patch by Jason Tishler.
+
+- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
+ not provide. Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
+
- Issue #28258: Fixed build with Estonian locale (python-config and distclean
targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.