Commit 17a3a1eb authored by Tom Lane's avatar Tom Lane

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.
parent 4806f26f
...@@ -130,11 +130,11 @@ else ...@@ -130,11 +130,11 @@ else
done done
done done
fi fi
# As usual, Windows has its own ideas. c:/Windows/System32 takes the # As usual, Windows has its own ideas. Possible default library
# place of /usr/lib as a possible default library location, and the # locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
# "lib" prefix might not be there. # and the "lib" prefix might not be there.
if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
do do
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
if test -e "$f"; then if test -e "$f"; then
......
...@@ -7673,11 +7673,11 @@ else ...@@ -7673,11 +7673,11 @@ else
done done
done done
fi fi
# As usual, Windows has its own ideas. c:/Windows/System32 takes the # As usual, Windows has its own ideas. Possible default library
# place of /usr/lib as a possible default library location, and the # locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
# "lib" prefix might not be there. # and the "lib" prefix might not be there.
if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
do do
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
if test -e "$f"; then if test -e "$f"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment