Issue #28849: Do not define sys.implementation._multiarch on Android.

This commit is contained in:
Xavier de Gaye 2016-12-10 17:31:28 +01:00
parent ebb39bcc04
commit 32cf1acda8
4 changed files with 9 additions and 48 deletions

View File

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

View File

@ -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
==============================================

24
configure vendored
View File

@ -5218,29 +5218,7 @@ cat >> conftest.c <<EOF
#undef sparc
#undef unix
#if defined(__ANDROID__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-android
# elif defined(__i386__)
i686-linux-android
# elif defined(__aarch64__) && defined(__AARCH64EL__)
# if defined(__ILP32__)
aarch64_ilp32-linux-android
# else
aarch64-linux-android
# endif
# elif defined(__ARM_EABI__) && defined(__ARMEL__)
arm-linux-androideabi
# elif defined(__mips_hard_float) && defined(_MIPSEL)
# if _MIPS_SIM == _ABIO32
mipsel-linux-android
# elif _MIPS_SIM == _ABI64
mips64el-linux-android
# else
# error unknown platform triplet
# endif
# else
# error unknown platform triplet
# endif
# Android is not a multiarch system.
#elif defined(__linux__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-gnu

View File

@ -770,29 +770,7 @@ cat >> conftest.c <<EOF
#undef sparc
#undef unix
#if defined(__ANDROID__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-android
# elif defined(__i386__)
i686-linux-android
# elif defined(__aarch64__) && defined(__AARCH64EL__)
# if defined(__ILP32__)
aarch64_ilp32-linux-android
# else
aarch64-linux-android
# endif
# elif defined(__ARM_EABI__) && defined(__ARMEL__)
arm-linux-androideabi
# elif defined(__mips_hard_float) && defined(_MIPSEL)
# if _MIPS_SIM == _ABIO32
mipsel-linux-android
# elif _MIPS_SIM == _ABI64
mips64el-linux-android
# else
# error unknown platform triplet
# endif
# else
# error unknown platform triplet
# endif
# Android is not a multiarch system.
#elif defined(__linux__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-gnu