mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shared libpython detection on OS X

Browse Source 
Apparently, looking for an appropriately named file doesn't work on some
older versions, so put the back the explicit platform detection.
This commit is contained in:
Peter Eisentraut 2015-05-01 23:12:45 -04:00
parent 0fd764647a
commit 010aa420b9
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@ -7542,23 +7542,28 @@ fi
# We need libpython as a shared library. With Python >=2.5, we check
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even
# though Py_ENABLE_SHARED does not get set. On Debian, the setting
# is not correct before the jessie release
# (http://bugs.debian.org/695979). We also want to support older
# Python versions. So as a fallback we see if there is a file that
# is named like a shared library.
# We need libpython as a shared library. With Python >=2.5, we
# check the Py_ENABLE_SHARED setting. On Debian, the setting is not
# correct before the jessie release (http://bugs.debian.org/695979).
# We also want to support older Python versions. So as a fallback
# we see if there is a file that is named like a shared library.
if test "$python_enable_shared" != 1; then
# We don't know the platform shared library extension here yet, so
# we try some candidates.
for dlsuffix in .so .dll .dylib .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1
break
fi
done
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# get set. The file detection logic below doesn't succeed on
# older OS X versions, so make it explicit.
if test "$PORTNAME" = darwin; then
python_enable_shared=1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for dlsuffix in .so .dll .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1
break
fi
done
fi
fi
if test "$python_enable_shared" != 1; then

35
configure.in
View File

@ -902,23 +902,28 @@ if test "$with_python" = yes; then
PGAC_PATH_PYTHON
PGAC_CHECK_PYTHON_EMBED_SETUP
# We need libpython as a shared library. With Python >=2.5, we check
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even
# though Py_ENABLE_SHARED does not get set. On Debian, the setting
# is not correct before the jessie release
# (http://bugs.debian.org/695979). We also want to support older
# Python versions. So as a fallback we see if there is a file that
# is named like a shared library.
# We need libpython as a shared library. With Python >=2.5, we
# check the Py_ENABLE_SHARED setting. On Debian, the setting is not
# correct before the jessie release (http://bugs.debian.org/695979).
# We also want to support older Python versions. So as a fallback
# we see if there is a file that is named like a shared library.
if test "$python_enable_shared" != 1; then
# We don't know the platform shared library extension here yet, so
# we try some candidates.
for dlsuffix in .so .dll .dylib .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1
break
fi
done
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# get set. The file detection logic below doesn't succeed on
# older OS X versions, so make it explicit.
if test "$PORTNAME" = darwin; then
python_enable_shared=1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for dlsuffix in .so .dll .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1
break
fi
done
fi
fi
if test "$python_enable_shared" != 1; then