[Python-checkins] cpython (3.6): Issue #28849: Do not define sys.implementation._multiarch on Android.

Sat Dec 10 11:35:16 EST 2016

https://hg.python.org/cpython/rev/b3ba41bf92c7
changeset: 105577:b3ba41bf92c7
branch: 3.6
parent: 105575:f3b9fd41b5cb
user: Xavier de Gaye <xdegaye at users.sourceforge.net>
date: Sat Dec 10 17:31:28 2016 +0100
summary:
 Issue #28849: Do not define sys.implementation._multiarch on Android.
files:
 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
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -385,7 +385,8 @@
 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 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,11 @@
 - 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
--- a/configure
+++ b/configure
@@ -5218,29 +5218,7 @@
 #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
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -770,29 +770,7 @@
 #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
-- 
Repository URL: https://hg.python.org/cpython
