traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36722: Debug build loads libraries built in release mode (GH-12952) 

In debug build, import now also looks for C extensions compiled in
release mode and for C extensions compiled in the stable ABI.
This commit is contained in:
Victor Stinner 2019-04-26 01:40:00 +02:00 committed by GitHub
parent 62dfd7d6fe
commit 5422e3cfb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2019-04-25-21-02-40.bpo-36722.8NApVM.rst Normal file
View File

@ -0,0 +1,2 @@
In debug build, import now also looks for C extensions compiled in release
mode and for C extensions compiled in the stable ABI.

5
Python/dynload_shlib.c
View File

@ -38,9 +38,10 @@ const char *_PyImport_DynLoadFiletab[] = {
".dll",
#else /* !__CYGWIN__ */
"." SOABI ".so",
#ifndef Py_DEBUG
#ifdef ALT_SOABI
"." ALT_SOABI ".so",
#endif
".abi" PYTHON_ABI_STRING ".so",
#endif /* ! Py_DEBUG */
".so",
#endif /* __CYGWIN__ */
NULL,

12
configure vendored
View File

@ -632,6 +632,7 @@ THREADHEADERS
LIBPL
PY_ENABLE_SHARED
EXT_SUFFIX
ALT_SOABI
SOABI
LIBC
LIBM
@ -15127,6 +15128,17 @@ SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFO
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
$as_echo "$SOABI" >&6; }
if test "$Py_DEBUG" = 'true'; then
# Similar to SOABI but remove "d" flag from ABIFLAGS
ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
cat >>confdefs.h <<_ACEOF
#define ALT_SOABI "${ALT_SOABI}"
_ACEOF
fi
case $ac_sys_system in
Linux*|GNU*|Darwin|VxWorks)

8
configure.ac
View File

@ -4627,6 +4627,14 @@ AC_MSG_CHECKING(SOABI)
SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
AC_MSG_RESULT($SOABI)
if test "$Py_DEBUG" = 'true'; then
# Similar to SOABI but remove "d" flag from ABIFLAGS
AC_SUBST(ALT_SOABI)
ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
AC_DEFINE_UNQUOTED(ALT_SOABI, "${ALT_SOABI}",
[Alternative SOABI used in debug build to load C extensions built in release mode])
fi
AC_SUBST(EXT_SUFFIX)
case $ac_sys_system in
Linux*|GNU*|Darwin|VxWorks)

4
pyconfig.h.in
View File

@ -12,6 +12,10 @@
support for AIX C++ shared extension modules. */
#undef AIX_GENUINE_CPLUSPLUS
/* Alternative SOABI used in debug build to load C extensions built in release
mode */
#undef ALT_SOABI
/* The Android API level. */
#undef ANDROID_API_LEVEL