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

Commitddd4f82

Browse files
committed
In python shlib probe, cater for OpenBSD, which omits the .so symlink.
Most Unix-oid platforms provide a symlink "libfoo.so" -> "libfoo.so.n.n"to allow the linker to resolve a reference "-lfoo" to a version-numberedshared library. OpenBSD has apparently hacked ld(1) to do this internally,because there are no such symlinks to be found in their librarydirectories. Tweak the new code in PGAC_CHECK_PYTHON_EMBED_SETUP to cope.Per buildfarm member curculio.
1 parenteb3bc0b commitddd4f82

File tree

2 files changed

+40
-4
lines changed

2 files changed

+40
-4
lines changed

‎config/python.m4

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's
8585
if test -e "${python_libdir}/${python_ldlibrary}" -a x"${python_ldlibrary}" != x"${ldlibrary}"
8686
then
8787
ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"`
88+
found_shlib=1
8889
else
8990
# Otherwise, guess the base name of the shlib.
9091
# LDVERSION was added in Python 3.2, before that use $python_version.
@@ -98,6 +99,7 @@ else
9899
found_shlib=0
99100
for d in "${python_libdir}" "${python_configdir}" /usr/lib64 /usr/lib
100101
do
102+
# We don't know the platform DLSUFFIX here, so check 'em all.
101103
for e in .so .dll .dylib .sl; do
102104
if test -e "$d/lib${ldlibrary}$e"; then
103105
python_libdir="$d"
@@ -106,12 +108,28 @@ else
106108
fi
107109
done
108110
done
111+
# Some platforms (OpenBSD) require us to accept a bare versioned shlib
112+
# (".so.n.n") as well. However, check this only after failing to find
113+
# ".so" anywhere, because yet other platforms (Debian) put the .so
114+
# symlink in a different directory from the underlying versioned shlib.
109115
if test "$found_shlib" != 1; then
110-
AC_MSG_ERROR([could not find shared library for Python
116+
for d in "${python_libdir}" "${python_configdir}" /usr/lib64 /usr/lib
117+
do
118+
for f in "$d/lib${ldlibrary}.so."* ; do
119+
if test -e "$f"; then
120+
python_libdir="$d"
121+
found_shlib=1
122+
break 2
123+
fi
124+
done
125+
done
126+
fi
127+
fi
128+
if test "$found_shlib" != 1; then
129+
AC_MSG_ERROR([could not find shared library for Python
111130
You might have to rebuild your Python installation. Refer to the
112131
documentation for details. Use --without-python to disable building
113132
PL/Python.])
114-
fi
115133
fi
116134
python_libspec="-L${python_libdir} -l${ldlibrary}"
117135

‎configure

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7628,6 +7628,7 @@ ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's
76287628
iftest -e"${python_libdir}/${python_ldlibrary}" -a x"${python_ldlibrary}"!= x"${ldlibrary}"
76297629
then
76307630
ldlibrary=`echo"${ldlibrary}"| sed"s/^lib//"`
7631+
found_shlib=1
76317632
else
76327633
# Otherwise, guess the base name of the shlib.
76337634
# LDVERSION was added in Python 3.2, before that use $python_version.
@@ -7641,6 +7642,7 @@ else
76417642
found_shlib=0
76427643
fordin"${python_libdir}""${python_configdir}" /usr/lib64 /usr/lib
76437644
do
7645+
# We don't know the platform DLSUFFIX here, so check 'em all.
76447646
forein .so .dll .dylib .sl;do
76457647
iftest -e"$d/lib${ldlibrary}$e";then
76467648
python_libdir="$d"
@@ -7649,12 +7651,28 @@ else
76497651
fi
76507652
done
76517653
done
7654+
# Some platforms (OpenBSD) require us to accept a bare versioned shlib
7655+
# (".so.n.n") as well. However, check this only after failing to find
7656+
# ".so" anywhere, because yet other platforms (Debian) put the .so
7657+
# symlink in a different directory from the underlying versioned shlib.
76527658
iftest"$found_shlib"!= 1;then
7653-
as_fn_error$?"could not find shared library for Python
7659+
fordin"${python_libdir}""${python_configdir}" /usr/lib64 /usr/lib
7660+
do
7661+
forfin"$d/lib${ldlibrary}.so."*;do
7662+
iftest -e"$f";then
7663+
python_libdir="$d"
7664+
found_shlib=1
7665+
break 2
7666+
fi
7667+
done
7668+
done
7669+
fi
7670+
fi
7671+
iftest"$found_shlib"!= 1;then
7672+
as_fn_error$?"could not find shared library for Python
76547673
You might have to rebuild your Python installation. Refer to the
76557674
documentation for details. Use --without-python to disable building
76567675
PL/Python.""$LINENO" 5
7657-
fi
76587676
fi
76597677
python_libspec="-L${python_libdir} -l${ldlibrary}"
76607678

0 commit comments

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