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

Commitfc76259

Browse files
committed
Huh, we do need to look in $python_configdir for the Python shlib.
Debian does it that way, for no doubt what seems to them a good reason.Thanks to Aidan Van Dyk for confirmation.
1 parent46ddbbb commitfc76259

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

‎config/python.m4

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ AC_SUBST(python_includespec)[]dnl
6767
# directory name and LDLIBRARY is the file name of the shlib. But in older
6868
# installations LDLIBRARY is frequently a useless path fragment, and it's also
6969
# 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.)
70+
# so that LIBDIR is irrelevant. Also, some packagers put the .so symlink for
71+
# the shlib in ${python_configdir} even though Python itself never does.
72+
# We must also check that what we found is a shared library not a plain
73+
# library, which we do by checking its extension. (We used to rely on
74+
# Py_ENABLE_SHARED, but that only tells us that a shlib exists, not that
75+
# we found it.)
7476
AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
7577
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
7678
AC_MSG_CHECKING([how to link an embedded Python application])
@@ -94,7 +96,8 @@ else
9496
fi
9597
# Search for a likely-looking file.
9698
found_shlib=0
97-
for d in "${python_libdir}" /usr/lib64 /usr/lib; do
99+
for d in "${python_libdir}" "${python_configdir}" /usr/lib64 /usr/lib
100+
do
98101
for e in .so .dll .dylib .sl; do
99102
if test -e "$d/lib${ldlibrary}$e"; then
100103
python_libdir="$d"

‎configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7639,7 +7639,8 @@ else
76397639
fi
76407640
# Search for a likely-looking file.
76417641
found_shlib=0
7642-
fordin"${python_libdir}" /usr/lib64 /usr/lib;do
7642+
fordin"${python_libdir}""${python_configdir}" /usr/lib64 /usr/lib
7643+
do
76437644
forein .so .dll .dylib .sl;do
76447645
iftest -e"$d/lib${ldlibrary}$e";then
76457646
python_libdir="$d"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp