rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tom Lane 2016-10-07 11:27:34 -04:00
parent 4806f26f9e
commit 17a3a1eb0e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/python.m4
View File

@ -130,11 +130,11 @@ else
done
done
fi
# As usual, Windows has its own ideas. c:/Windows/System32 takes the
# place of /usr/lib as a possible default library location, and the
# "lib" prefix might not be there.
if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32
# As usual, Windows has its own ideas. Possible default library
# locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
# and the "lib" prefix might not be there.
if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
do
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
if test -e "$f"; then

10
configure vendored
View File

@ -7673,11 +7673,11 @@ else
done
done
fi
# As usual, Windows has its own ideas. c:/Windows/System32 takes the
# place of /usr/lib as a possible default library location, and the
# "lib" prefix might not be there.
if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32
# As usual, Windows has its own ideas. Possible default library
# locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
# and the "lib" prefix might not be there.
if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
do
for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
if test -e "$f"; then