From 32cf1acda85dd14c0865a7ce68dbc96980d6714a Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Sat, 10 Dec 2016 17:31:28 +0100 Subject: [PATCH] Issue #28849: Do not define sys.implementation._multiarch on Android. --- Lib/test/test_sysconfig.py | 4 ++-- Misc/NEWS | 5 +++++ configure | 24 +----------------------- configure.ac | 24 +----------------------- 4 files changed, 9 insertions(+), 48 deletions(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 091e90522de..747b2e5815f 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -385,7 +385,8 @@ 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 machine = platform.machine() @@ -395,7 +396,6 @@ class TestSysConfig(unittest.TestCase): if re.match('(i[3-6]86|x86_64)$', machine): if ctypes.sizeof(ctypes.c_char_p()) == 4: self.assertTrue(suffix.endswith('i386-linux-gnu.so') or - suffix.endswith('i686-linux-android.so') or suffix.endswith('x86_64-linux-gnux32.so'), suffix) else: # 8 byte pointer size diff --git a/Misc/NEWS b/Misc/NEWS index 3de5be775f1..5c323a1038d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -44,6 +44,11 @@ Tests - Issue #26939: Add the support.setswitchinterval() function to fix test_functools hanging on the Android armv7 qemu emulator. +Build +----- + +- Issue #28849: Do not define sys.implementation._multiarch on Android. + What's New in Python 3.6.0 release candidate 1 ============================================== diff --git a/configure b/configure index cf95b2705a9..82323f5ee57 100755 --- a/configure +++ b/configure @@ -5218,29 +5218,7 @@ cat >> conftest.c <> conftest.c <