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

Commit7ce4abf

Browse files
committed
Improve detection of Python 3.2 installations
Because of ABI tagging, the library version number might no longer beexactly the Python version number, so do extra lookups. This affectsinstallations without a shared library, such as ActiveState'sinstaller.Also update the way to detect the location of the 'config' directory,which can also be versioned.Ashesh Vashi
1 parent7b1509d commit7ce4abf

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

‎config/python.m4

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
AC_MSG_CHECKING([Python configuration directory])
3333
python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"`
3434
python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"`
35-
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os;print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
35+
python_configdir=`${PYTHON} -c "import distutils.sysconfig,string;print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
3636
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
3737
3838
AC_SUBST(python_majorversion)[]dnl
@@ -69,7 +69,12 @@ then
6969
else
7070
# Old way: use libpython from python_configdir
7171
python_libdir="${python_configdir}"
72-
python_libspec="-L${python_libdir} -lpython${python_version}"
72+
# LDVERSION was introduced in Python 3.2.
73+
python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
74+
if test x"${python_ldversion}" = x""; then
75+
python_ldversion=$python_version
76+
fi
77+
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
7378
fi
7479
7580
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`

‎configure

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7242,7 +7242,7 @@ fi
72427242
$as_echo_n "checking Python configuration directory... " >&6; }
72437243
python_majorversion=`${PYTHON} -c "import sys; print(sys.version[0])"`
72447244
python_version=`${PYTHON} -c "import sys; print(sys.version[:3])"`
7245-
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os;print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
7245+
python_configdir=`${PYTHON} -c "import distutils.sysconfig,string;print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
72467246
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
72477247

72487248
# This should be enough of a message.
@@ -7266,7 +7266,12 @@ then
72667266
else
72677267
# Old way: use libpython from python_configdir
72687268
python_libdir="${python_configdir}"
7269-
python_libspec="-L${python_libdir} -lpython${python_version}"
7269+
# LDVERSION was introduced in Python 3.2.
7270+
python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
7271+
if test x"${python_ldversion}" = x""; then
7272+
python_ldversion=$python_version
7273+
fi
7274+
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
72707275
fi
72717276

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

0 commit comments

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