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

Windows also needs an override of the shared libpython detection

Browse Source
This commit is contained in:
Peter Eisentraut 2015-05-02 13:23:16 -04:00
parent e30a864963
commit 67df9782e9
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -7549,15 +7549,18 @@ fi
# we see if there is a file that is named like a shared library. # we see if there is a file that is named like a shared library.
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
# 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 if test "$PORTNAME" = darwin; then
# 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.
python_enable_shared=1
elif test "$PORTNAME" = win32; then
# Windows also needs an explicit override.
python_enable_shared=1 python_enable_shared=1
else else
# We don't know the platform shared library extension here yet, # We don't know the platform shared library extension here yet,
# so we try some candidates. # so we try some candidates.
for dlsuffix in .so .dll .sl; do for dlsuffix in .so .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1 python_enable_shared=1
break break

11
configure.in
View File

@ -909,15 +909,18 @@ if test "$with_python" = yes; then
# we see if there is a file that is named like a shared library. # we see if there is a file that is named like a shared library.
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
# 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 if test "$PORTNAME" = darwin; then
# 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.
python_enable_shared=1
elif test "$PORTNAME" = win32; then
# Windows also needs an explicit override.
python_enable_shared=1 python_enable_shared=1
else else
# We don't know the platform shared library extension here yet, # We don't know the platform shared library extension here yet,
# so we try some candidates. # so we try some candidates.
for dlsuffix in .so .dll .sl; do for dlsuffix in .so .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1 python_enable_shared=1
break break

1
src/pl/plpython/Makefile
View File

@ -8,7 +8,6 @@ include $(top_builddir)/src/Makefile.global
# Windows needs to convert backslashed paths to normal slashes, # Windows needs to convert backslashed paths to normal slashes,
# and we have to remove -lpython from the link since we are building our own # and we have to remove -lpython from the link since we are building our own
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
shared_libpython = yes
python_includespec := $(subst \,/,$(python_includespec)) python_includespec := $(subst \,/,$(python_includespec))
override python_libspec = override python_libspec =
endif endif