diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index a29ca96..7efa0ec 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -386,8 +386,7 @@ class TestSysConfig(unittest.TestCase): self.assertIsNotNone(vars['SO']) self.assertEqual(vars['SO'], vars['EXT_SUFFIX']) - @unittest.skipUnless(sys.platform == 'linux' and - hasattr(sys.implementation, '_multiarch'), + @unittest.skipUnless(False, 'multiarch-specific test') def test_triplet_in_ext_suffix(self): ctypes = import_module('ctypes') diff --git a/Makefile.pre.in b/Makefile.pre.in index 5e88e3f..5bcde6b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -40,6 +40,7 @@ AR= @AR@ RANLIB= @RANLIB@ READELF= @READELF@ SOABI= @SOABI@ +SOABI3= @SOABI3@ LDVERSION= @LDVERSION@ GITVERSION= @GITVERSION@ GITTAG= @GITTAG@ @@ -764,6 +765,7 @@ Modules/signalmodule.o: $(srcdir)/Modules/signalmodule.c $(srcdir)/Modules/posix Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ -DSOABI='"$(SOABI)"' \ + -DSOABI3='"$(SOABI3)"' \ -o $@ $(srcdir)/Python/dynload_shlib.c Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index c51f97ab..aa27cf17 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -38,6 +38,7 @@ const char *_PyImport_DynLoadFiletab[] = { ".dll", #else /* !__CYGWIN__ */ "." SOABI ".so", + "." SOABI3 ".so", #ifdef ALT_SOABI "." ALT_SOABI ".so", #endif diff --git a/configure.ac b/configure.ac index fc1dba6..0478610 100644 --- a/configure.ac +++ b/configure.ac @@ -4636,10 +4636,12 @@ AC_C_BIGENDIAN # would get a shared library ABI version tag of 'cpython-32dmu' and shared # libraries would be named 'foo.cpython-32dmu.so'. AC_SUBST(SOABI) +AC_SUBST(SOABI3) AC_MSG_CHECKING(ABIFLAGS) AC_MSG_RESULT($ABIFLAGS) -AC_MSG_CHECKING(SOABI) -SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} +AC_MSG_CHECKING(SOABI3) +SOABI3='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} +SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS} AC_MSG_RESULT($SOABI) AC_SUBST(EXT_SUFFIX)