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

Commit11c0e74

Browse files
committed
Try to fix python shlib probe for MinGW.
Per discussion with Andrew Dunstan, it seems there are three peculiaritiesof the Python installation on MinGW (or at least, of the instance onbuildfarm member frogmouth). First, the library name doesn't contain"2.7" but just "27". It looks like we can deal with that by consultingget_config_vars('VERSION') to see whether a dot should be used or not.Second, the library might be in c:/Windows/System32, analogously to itpossibly being in /usr/lib on Unix-oid platforms. Third, it's apparentlynot standard to use the prefix "lib" on the file name. This patch willaccept files with or without "lib", but the first part of that may wellbe dead code.
1 parent61f9e7b commit11c0e74

File tree

2 files changed

+46
-4
lines changed

2 files changed

+46
-4
lines changed

‎config/python.m4

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,18 @@ then
8888
found_shlib=1
8989
else
9090
# Otherwise, guess the base name of the shlib.
91-
# LDVERSION was added in Python 3.2, before that use $python_version.
91+
# LDVERSION was added in Python 3.2, before that use VERSION,
92+
# or failing that, $python_version from _PGAC_CHECK_PYTHON_DIRS.
9293
python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
9394
if test x"${python_ldversion}" != x""; then
9495
ldlibrary="python${python_ldversion}"
9596
else
96-
ldlibrary="python${python_version}"
97+
python_version_var=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('VERSION'))))"`
98+
if test x"${python_version_var}" != x""; then
99+
ldlibrary="python${python_version_var}"
100+
else
101+
ldlibrary="python${python_version}"
102+
fi
97103
fi
98104
# Search for a likely-looking file.
99105
found_shlib=0
@@ -124,6 +130,21 @@ else
124130
done
125131
done
126132
fi
133+
# As usual, Windows has its own ideas. c:/Windows/System32 takes the
134+
# place of /usr/lib as a possible default library location, and the
135+
# "lib" prefix might not be there.
136+
if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then
137+
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32
138+
do
139+
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
140+
if test -e "$f"; then
141+
python_libdir="$d"
142+
found_shlib=1
143+
break 2
144+
fi
145+
done
146+
done
147+
fi
127148
fi
128149
if test "$found_shlib" != 1; then
129150
AC_MSG_ERROR([could not find shared library for Python

‎configure

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7631,12 +7631,18 @@ then
76317631
found_shlib=1
76327632
else
76337633
# Otherwise, guess the base name of the shlib.
7634-
# LDVERSION was added in Python 3.2, before that use $python_version.
7634+
# LDVERSION was added in Python 3.2, before that use VERSION,
7635+
# or failing that, $python_version from _PGAC_CHECK_PYTHON_DIRS.
76357636
python_ldversion=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
76367637
iftest x"${python_ldversion}"!= x"";then
76377638
ldlibrary="python${python_ldversion}"
76387639
else
7639-
ldlibrary="python${python_version}"
7640+
python_version_var=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('VERSION'))))"`
7641+
iftest x"${python_version_var}"!= x"";then
7642+
ldlibrary="python${python_version_var}"
7643+
else
7644+
ldlibrary="python${python_version}"
7645+
fi
76407646
fi
76417647
# Search for a likely-looking file.
76427648
found_shlib=0
@@ -7667,6 +7673,21 @@ else
76677673
done
76687674
done
76697675
fi
7676+
# As usual, Windows has its own ideas. c:/Windows/System32 takes the
7677+
# place of /usr/lib as a possible default library location, and the
7678+
# "lib" prefix might not be there.
7679+
iftest"$found_shlib"!= 1 -a"$PORTNAME" = win32;then
7680+
fordin"${python_libdir}""${python_configdir}" c:/Windows/System32
7681+
do
7682+
forfin"$d/lib${ldlibrary}.dll""$d/${ldlibrary}.dll";do
7683+
iftest -e"$f";then
7684+
python_libdir="$d"
7685+
found_shlib=1
7686+
break 2
7687+
fi
7688+
done
7689+
done
7690+
fi
76707691
fi
76717692
iftest"$found_shlib"!= 1;then
76727693
as_fn_error$?"could not find shared library for Python

0 commit comments

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