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

Commit17a3a1e

Browse files
committed
Fix python shlib probe for Cygwin.
On buildfarm member cockatiel, that library is in /usr/bin.(Possibly we should look at $PATH on this platform?)Per off-list report from Andrew Dunstan.
1 parent4806f26 commit17a3a1e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎config/python.m4‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ else
130130
done
131131
done
132132
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
133+
# As usual, Windows has its own ideas.Possible default library
134+
#locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
135+
#and the"lib" prefix might not be there.
136+
if test "$found_shlib" != 1 -a\("$PORTNAME" = win32-o "$PORTNAME" = cygwin \); then
137+
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
138138
do
139139
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
140140
if test -e "$f"; then

‎configure‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7673,11 +7673,11 @@ else
76737673
done
76747674
done
76757675
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
7676+
# As usual, Windows has its own ideas.Possible default library
7677+
#locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
7678+
#and the"lib" prefix might not be there.
7679+
iftest"$found_shlib"!= 1 -a\("$PORTNAME" = win32-o"$PORTNAME" = cygwin\);then
7680+
fordin"${python_libdir}""${python_configdir}" c:/Windows/System32 /usr/bin
76817681
do
76827682
forfin"$d/lib${ldlibrary}.dll""$d/${ldlibrary}.dll";do
76837683
iftest -e"$f";then

0 commit comments

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