mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
bpo-21536: On Android, C extensions are linked to libpython (GH-12989)
This commit is contained in:
parent
b021ba5028
commit
254b309c80
|
@ -279,7 +279,8 @@ the full reference.
|
|||
|
||||
.. versionchanged:: 3.8
|
||||
|
||||
On Unix, C extensions are no longer linked to libpython.
|
||||
On Unix, C extensions are no longer linked to libpython except on
|
||||
Android.
|
||||
|
||||
|
||||
.. class:: Distribution
|
||||
|
|
|
@ -883,12 +883,12 @@ Changes in the Python API
|
|||
Changes in the C API
|
||||
--------------------
|
||||
|
||||
* On Unix, C extensions are no longer linked to libpython. When Python is
|
||||
embedded, ``libpython`` must not be loaded with ``RTLD_LOCAL``, but
|
||||
``RTLD_GLOBAL`` instead. Previously, using ``RTLD_LOCAL``, it was already not
|
||||
possible to load C extensions which were not linked to ``libpython``, like C
|
||||
extensions of the standard library built by the ``*shared*`` section of
|
||||
``Modules/Setup``.
|
||||
* On Unix, C extensions are no longer linked to libpython except on
|
||||
Android. When Python is embedded, ``libpython`` must not be loaded with
|
||||
``RTLD_LOCAL``, but ``RTLD_GLOBAL`` instead. Previously, using
|
||||
``RTLD_LOCAL``, it was already not possible to load C extensions which were
|
||||
not linked to ``libpython``, like C extensions of the standard library built
|
||||
by the ``*shared*`` section of ``Modules/Setup``.
|
||||
|
||||
* Use of ``#`` variants of formats in parsing or building value (e.g.
|
||||
:c:func:`PyArg_ParseTuple`, :c:func:`Py_BuildValue`, :c:func:`PyObject_CallFunction`,
|
||||
|
|
|
@ -714,5 +714,20 @@ def get_libraries(self, ext):
|
|||
# don't extend ext.libraries, it may be shared with other
|
||||
# extensions, it is a reference to the original list
|
||||
return ext.libraries + [pythonlib]
|
||||
# On Android only the main executable and LD_PRELOADs are considered
|
||||
# to be RTLD_GLOBAL, all the dependencies of the main executable
|
||||
# remain RTLD_LOCAL and so the shared libraries must be linked with
|
||||
# libpython when python is built with a shared python library (issue
|
||||
# bpo-21536).
|
||||
else:
|
||||
from distutils.sysconfig import get_config_var
|
||||
if get_config_var('Py_ENABLE_SHARED'):
|
||||
# Either a native build on an Android device or the
|
||||
# cross-compilation of Python.
|
||||
if (hasattr(sys, 'getandroidapilevel') or
|
||||
('_PYTHON_HOST_PLATFORM' in os.environ and
|
||||
get_config_var('ANDROID_API_LEVEL') != 0)):
|
||||
ldversion = get_config_var('LDVERSION')
|
||||
return ext.libraries + ['python' + ldversion]
|
||||
|
||||
return ext.libraries
|
||||
|
|
|
@ -41,6 +41,7 @@ AR= @AR@
|
|||
READELF= @READELF@
|
||||
SOABI= @SOABI@
|
||||
LDVERSION= @LDVERSION@
|
||||
LIBPYTHON= @LIBPYTHON@
|
||||
GITVERSION= @GITVERSION@
|
||||
GITTAG= @GITTAG@
|
||||
GITBRANCH= @GITBRANCH@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
On Unix, C extensions are no longer linked to libpython.
|
||||
On Unix, C extensions are no longer linked to libpython except on Android.
|
||||
|
||||
It is now possible for a statically linked Python to load a C extension built
|
||||
using a shared library Python.
|
||||
|
|
|
@ -47,7 +47,10 @@ for opt in opt_flags:
|
|||
print(' '.join(flags))
|
||||
|
||||
elif opt in ('--libs', '--ldflags'):
|
||||
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
|
||||
libpython = getvar('LIBPYTHON')
|
||||
libs = [libpython] if libpython else []
|
||||
libs.extend(getvar('LIBS').split() + getvar('SYSLIBS').split())
|
||||
|
||||
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
|
||||
# shared library in prefix/lib/.
|
||||
if opt == '--ldflags':
|
||||
|
|
|
@ -41,7 +41,7 @@ LIBM="@LIBM@"
|
|||
LIBC="@LIBC@"
|
||||
SYSLIBS="$LIBM $LIBC"
|
||||
ABIFLAGS="@ABIFLAGS@"
|
||||
LIBS="@LIBS@ $SYSLIBS"
|
||||
LIBS="@LIBPYTHON@ @LIBS@ $SYSLIBS"
|
||||
BASECFLAGS="@BASECFLAGS@"
|
||||
LDLIBRARY="@LDLIBRARY@"
|
||||
OPT="@OPT@"
|
||||
|
|
9
configure
vendored
9
configure
vendored
|
@ -631,6 +631,7 @@ SRCDIRS
|
|||
THREADHEADERS
|
||||
LIBPL
|
||||
PY_ENABLE_SHARED
|
||||
LIBPYTHON
|
||||
EXT_SUFFIX
|
||||
ALT_SOABI
|
||||
SOABI
|
||||
|
@ -15154,6 +15155,14 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5
|
||||
$as_echo "$LDVERSION" >&6; }
|
||||
|
||||
# On Android the shared libraries must be linked with libpython.
|
||||
|
||||
if test -z "$ANDROID_API_LEVEL"; then
|
||||
LIBPYTHON=''
|
||||
else
|
||||
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
|
||||
fi
|
||||
|
||||
|
||||
if test x$PLATFORM_TRIPLET = x; then
|
||||
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
|
||||
|
|
|
@ -4648,6 +4648,14 @@ AC_MSG_CHECKING(LDVERSION)
|
|||
LDVERSION='$(VERSION)$(ABIFLAGS)'
|
||||
AC_MSG_RESULT($LDVERSION)
|
||||
|
||||
# On Android the shared libraries must be linked with libpython.
|
||||
AC_SUBST(LIBPYTHON)
|
||||
if test -z "$ANDROID_API_LEVEL"; then
|
||||
LIBPYTHON=''
|
||||
else
|
||||
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
|
||||
fi
|
||||
|
||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||
AC_SUBST(PY_ENABLE_SHARED)
|
||||
if test x$PLATFORM_TRIPLET = x; then
|
||||
|
|
Loading…
Reference in a new issue