Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit46ddbbb

Browse files
committed
Improve (I hope) our autolocation of the Python shared library.
Older versions of Python produce garbage (or at least useless) values ofget_config_vars('LDLIBRARY'). Newer versions produce garbage (or at leastuseless) values of get_config_vars('SO'), which was defeating our configurelogic that attempted to identify where the Python shlib really is. The netresult, at least with a stock Python 3.5 installation on macOS, was thatwe were linking against a static library in the mistaken belief that it wasa shared library. This managed to work, if you count statically absorbinglibpython into plpython.so as working. But it no longer works as of commitd51924b, because now we get separate static copies of libpython inplpython.so and hstore_plpython.so, and those can't interoperate on thesame data. There are some other infelicities like assuming that nobodyever installs a private version of Python on a macOS machine.Hence, forget about looking in $python_configdir for the Python shlib;as far as I can tell no version of Python has ever put one there, andcertainly no currently-supported version does. Also, rather than relyingon get_config_vars('SO'), just try all the possibilities for shlibextensions. Also, rather than trusting Py_ENABLE_SHARED, believe we'vefound a shlib only if it has a recognized extension. Last, explicitlycope with the possibility that the shlib is really in /usr/lib and$python_libdir is a red herring --- this is the actual situation on oldermacOS, but we were only accidentally working with it.Discussion: <5300.1475592228@sss.pgh.pa.us>
1 parent6c9c95e commit46ddbbb

File tree

3 files changed

+67
-97
lines changed

3 files changed

+67
-97
lines changed

‎config/python.m4

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,36 +58,59 @@ AC_SUBST(python_includespec)[]dnl
5858
# PGAC_CHECK_PYTHON_EMBED_SETUP
5959
# -----------------------------
6060
#
61-
# Note: selecting libpython from python_configdir works in all Python
62-
# releases, but it generally finds a non-shared library, which means
63-
# that we are binding the python interpreter right into libplpython.so.
64-
# In Python 2.3 and up there should be a shared library available in
65-
# the main library location.
61+
# Set python_libdir to the path of the directory containing the Python shared
62+
# library. Set python_libspec to the -L/-l linker switches needed to link it.
63+
# Set python_additional_libs to contain any additional linker switches needed
64+
# for subsidiary libraries.
65+
#
66+
# In modern, well-configured Python installations, LIBDIR gives the correct
67+
# directory name and LDLIBRARY is the file name of the shlib. But in older
68+
# installations LDLIBRARY is frequently a useless path fragment, and it's also
69+
# possible that the shlib is in a standard library directory such as /usr/lib
70+
# so that LIBDIR is of no interest. We must also check that what we found is
71+
# a shared library not a plain library, which we do by checking its extension.
72+
# (We used to rely on Py_ENABLE_SHARED, but that only tells us that a shlib
73+
# exists, not that we found it.)
6674
AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
6775
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
6876
AC_MSG_CHECKING([how to link an embedded Python application])
6977
7078
python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
7179
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
72-
python_so=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
73-
ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"`
74-
python_enable_shared=`${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_vars().get('Py_ENABLE_SHARED',0))"`
7580
76-
if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
81+
# If LDLIBRARY exists and has a shlib extension, use it verbatim.
82+
ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's/\.dylib$//' -e 's/\.sl$//'`
83+
if test -e "${python_libdir}/${python_ldlibrary}" -a x"${python_ldlibrary}" != x"${ldlibrary}"
7784
then
78-
# New way: use the official shared library
7985
ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"`
80-
python_libspec="-L${python_libdir} -l${ldlibrary}"
8186
else
82-
# Old way: use libpython from python_configdir
83-
python_libdir="${python_configdir}"
84-
# LDVERSION was introduced in Python 3.2.
87+
# Otherwise, guess the base name of the shlib.
88+
# LDVERSION was added in Python 3.2, before that use $python_version.
8589
python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
86-
if test x"${python_ldversion}" = x""; then
87-
python_ldversion=$python_version
90+
if test x"${python_ldversion}" != x""; then
91+
ldlibrary="python${python_ldversion}"
92+
else
93+
ldlibrary="python${python_version}"
94+
fi
95+
# Search for a likely-looking file.
96+
found_shlib=0
97+
for d in "${python_libdir}" /usr/lib64 /usr/lib; do
98+
for e in .so .dll .dylib .sl; do
99+
if test -e "$d/lib${ldlibrary}$e"; then
100+
python_libdir="$d"
101+
found_shlib=1
102+
break 2
103+
fi
104+
done
105+
done
106+
if test "$found_shlib" != 1; then
107+
AC_MSG_ERROR([could not find shared library for Python
108+
You might have to rebuild your Python installation. Refer to the
109+
documentation for details. Use --without-python to disable building
110+
PL/Python.])
88111
fi
89-
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
90112
fi
113+
python_libspec="-L${python_libdir} -l${ldlibrary}"
91114
92115
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
93116

‎configure

Lines changed: 27 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7622,25 +7622,40 @@ $as_echo_n "checking how to link an embedded Python application... " >&6; }
76227622

76237623
python_libdir=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
76247624
python_ldlibrary=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
7625-
python_so=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
7626-
ldlibrary=`echo"${python_ldlibrary}"| sed"s/${python_so}$//"`
7627-
python_enable_shared=`${PYTHON} -c"import distutils.sysconfig; print(distutils.sysconfig.get_config_vars().get('Py_ENABLE_SHARED',0))"`
76287625

7629-
iftest x"${python_libdir}"!= x"" -a x"${python_ldlibrary}"!= x"" -a x"${python_ldlibrary}"!= x"${ldlibrary}"
7626+
# If LDLIBRARY exists and has a shlib extension, use it verbatim.
7627+
ldlibrary=`echo"${python_ldlibrary}"| sed -e's/\.so$//' -e's/\.dll$//' -e's/\.dylib$//' -e's/\.sl$//'`
7628+
iftest -e"${python_libdir}/${python_ldlibrary}" -a x"${python_ldlibrary}"!= x"${ldlibrary}"
76307629
then
7631-
# New way: use the official shared library
76327630
ldlibrary=`echo"${ldlibrary}"| sed"s/^lib//"`
7633-
python_libspec="-L${python_libdir} -l${ldlibrary}"
76347631
else
7635-
# Old way: use libpython from python_configdir
7636-
python_libdir="${python_configdir}"
7637-
# LDVERSION was introduced in Python 3.2.
7632+
# Otherwise, guess the base name of the shlib.
7633+
# LDVERSION was added in Python 3.2, before that use $python_version.
76387634
python_ldversion=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
7639-
iftest x"${python_ldversion}" = x"";then
7640-
python_ldversion=$python_version
7635+
iftest x"${python_ldversion}"!= x"";then
7636+
ldlibrary="python${python_ldversion}"
7637+
else
7638+
ldlibrary="python${python_version}"
7639+
fi
7640+
# Search for a likely-looking file.
7641+
found_shlib=0
7642+
fordin"${python_libdir}" /usr/lib64 /usr/lib;do
7643+
forein .so .dll .dylib .sl;do
7644+
iftest -e"$d/lib${ldlibrary}$e";then
7645+
python_libdir="$d"
7646+
found_shlib=1
7647+
break 2
7648+
fi
7649+
done
7650+
done
7651+
iftest"$found_shlib"!= 1;then
7652+
as_fn_error$?"could not find shared library for Python
7653+
You might have to rebuild your Python installation. Refer to the
7654+
documentation for details. Use --without-python to disable building
7655+
PL/Python.""$LINENO" 5
76417656
fi
7642-
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
76437657
fi
7658+
python_libspec="-L${python_libdir} -l${ldlibrary}"
76447659

76457660
python_additional_libs=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
76467661

@@ -7649,40 +7664,6 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
76497664

76507665

76517666

7652-
7653-
# We need libpython as a shared library. With Python >=2.5, we
7654-
# check the Py_ENABLE_SHARED setting. On Debian, the setting is not
7655-
# correct before the jessie release (http://bugs.debian.org/695979).
7656-
# We also want to support older Python versions. So as a fallback
7657-
# we see if there is a file that is named like a shared library.
7658-
7659-
iftest"$python_enable_shared"!= 1;then
7660-
iftest"$PORTNAME" = darwin;then
7661-
# macOS does supply a .dylib even though Py_ENABLE_SHARED does
7662-
# not get set. The file detection logic below doesn't succeed
7663-
# on older macOS versions, so make it explicit.
7664-
python_enable_shared=1
7665-
eliftest"$PORTNAME" = win32;then
7666-
# Windows also needs an explicit override.
7667-
python_enable_shared=1
7668-
else
7669-
# We don't know the platform shared library extension here yet,
7670-
# so we try some candidates.
7671-
fordlsuffixin .so .sl;do
7672-
if ls"$python_libdir"/libpython*${dlsuffix}*>/dev/null2>&1;then
7673-
python_enable_shared=1
7674-
break
7675-
fi
7676-
done
7677-
fi
7678-
fi
7679-
7680-
iftest"$python_enable_shared"!= 1;then
7681-
as_fn_error$?"cannot build PL/Python because libpython is not a shared library
7682-
You might have to rebuild your Python installation. Refer to the
7683-
documentation for details. Use --without-python to disable building
7684-
PL/Python.""$LINENO" 5
7685-
fi
76867667
fi
76877668

76887669
iftest"$cross_compiling" = yes&&test -z"$with_system_tzdata";then

‎configure.in

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -934,40 +934,6 @@ fi
934934
if test "$with_python" = yes; then
935935
PGAC_PATH_PYTHON
936936
PGAC_CHECK_PYTHON_EMBED_SETUP
937-
938-
# We need libpython as a shared library. With Python >=2.5, we
939-
# check the Py_ENABLE_SHARED setting. On Debian, the setting is not
940-
# correct before the jessie release (http://bugs.debian.org/695979).
941-
# We also want to support older Python versions. So as a fallback
942-
# we see if there is a file that is named like a shared library.
943-
944-
if test "$python_enable_shared" != 1; then
945-
if test "$PORTNAME" = darwin; then
946-
# macOS does supply a .dylib even though Py_ENABLE_SHARED does
947-
# not get set. The file detection logic below doesn't succeed
948-
# on older macOS versions, so make it explicit.
949-
python_enable_shared=1
950-
elif test "$PORTNAME" = win32; then
951-
# Windows also needs an explicit override.
952-
python_enable_shared=1
953-
else
954-
# We don't know the platform shared library extension here yet,
955-
# so we try some candidates.
956-
for dlsuffix in .so .sl; do
957-
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
958-
python_enable_shared=1
959-
break
960-
fi
961-
done
962-
fi
963-
fi
964-
965-
if test "$python_enable_shared" != 1; then
966-
AC_MSG_ERROR([cannot build PL/Python because libpython is not a shared library
967-
You might have to rebuild your Python installation. Refer to the
968-
documentation for details. Use --without-python to disable building
969-
PL/Python.])
970-
fi
971937
fi
972938

973939
if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp