diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-10 16:34:46 (GMT) |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-10 16:34:46 (GMT) |
| commit | 5ca2b10213b4a5727dc99521c1b07ba75f3c321b (patch) | |
| tree | 14516840feea9dc9a19753f4f49a0cd77970454e | |
| parent | 5c7198d46417cad8ca031b3d6a9d97c2ee6a1807 (diff) | |
| parent | 32cf1acda85dd14c0865a7ce68dbc96980d6714a (diff) | |
| download | cpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.zip cpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.tar.gz cpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.tar.bz2 | |
Issue #28849: Merge 3.6.
| -rw-r--r-- | Lib/test/test_sysconfig.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.ac | 24 |
4 files changed, 6 insertions, 48 deletions
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index d2aa8b4..a3baea8 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): ctypes = import_module('ctypes') import platform, re @@ -396,7 +397,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 @@ -528,6 +528,8 @@ Documentation 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. @@ -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 diff --git a/configure.ac b/configure.ac index 33a9d56..7f4713b 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |