Attachment 7140 Details for Bug 33208 – new triplet removal patch

[patch] new triplet removal patch

0001-python-3.5.1-alt-disable-build-PLATFORM_TRIPLET.patch (text/plain), 2.65 KB, created by Fr. Br. George on 2017-07-10 23:16:39 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Fr. Br. George

Created: 2017-07-10 23:16:39 MSK

Size: 2.65 KB

patch

obsolete

>From 773edc3fd003f4214b173bbd96e3984836876da8 Mon Sep 17 00:00:00 2001
>From: Your Name <you@example.com>
>Date: Mon, 10 Jul 2017 17:25:46 +0000
>Subject: [PATCH] python 3.5.1 alt disable build PLATFORM_TRIPLET
>
>---
> Lib/test/test_sysconfig.py | 2 +-
> Makefile.pre.in            | 2 ++
> Python/dynload_shlib.c     | 1 +
> configure.ac               | 6 ++++--
> 4 files changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
>index 0917c3e..ccbe132 100644
>--- a/Lib/test/test_sysconfig.py
>+++ b/Lib/test/test_sysconfig.py
>@@ -385,7 +385,7 @@ 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(False, 'Linux-specific test')
>     def test_triplet_in_ext_suffix(self):
>         import ctypes, platform, re
>         machine = platform.machine()
>diff --git a/Makefile.pre.in b/Makefile.pre.in
>index bcdb1ac..43af47a 100644
>--- a/Makefile.pre.in
>+++ b/Makefile.pre.in
>@@ -39,6 +39,7 @@ AR=		@AR@
> RANLIB=		@RANLIB@
> READELF=	@READELF@
> SOABI=		@SOABI@
>+SOABI3=		@SOABI3@
> LDVERSION=	@LDVERSION@
> HGVERSION=	@HGVERSION@
> HGTAG=		@HGTAG@
>@@ -767,6 +768,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 7f8f134..b7efc4d 100644
>--- a/Python/dynload_shlib.c
>+++ b/Python/dynload_shlib.c
>@@ -37,6 +37,7 @@ const char *_PyImport_DynLoadFiletab[] = {
>     ".dll",
> #else  /* !__CYGWIN__ */
>     "." SOABI ".so",
>+    "." SOABI3 ".so",
>     ".abi" PYTHON_ABI_STRING ".so",
>     ".so",
> #endif  /* __CYGWIN__ */
>diff --git a/configure.ac b/configure.ac
>index 694293e..91b759d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -4354,10 +4354,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)
>-- 
>2.10.3
>

Actions: View | Diff

Attachments on bug 33208: 7140