Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 67df978

Browse files
committed
Windows also needs an override of the shared libpython detection
1 parent e30a864 commit 67df978

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

configure

+7-4
Original file line numberDiff line numberDiff line change
@@ -7549,15 +7549,18 @@ fi
75497549
# we see if there is a file that is named like a shared library.
75507550

75517551
if test "$python_enable_shared" != 1; then
7552-
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
7553-
# get set. The file detection logic below doesn't succeed on
7554-
# older OS X versions, so make it explicit.
75557552
if test "$PORTNAME" = darwin; then
7553+
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
7554+
# not get set. The file detection logic below doesn't succeed
7555+
# on older OS X versions, so make it explicit.
7556+
python_enable_shared=1
7557+
elif test "$PORTNAME" = win32; then
7558+
# Windows also needs an explicit override.
75567559
python_enable_shared=1
75577560
else
75587561
# We don't know the platform shared library extension here yet,
75597562
# so we try some candidates.
7560-
for dlsuffix in .so .dll .sl; do
7563+
for dlsuffix in .so .sl; do
75617564
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
75627565
python_enable_shared=1
75637566
break

configure.in

+7-4
Original file line numberDiff line numberDiff line change
@@ -909,15 +909,18 @@ if test "$with_python" = yes; then
909909
# we see if there is a file that is named like a shared library.
910910

911911
if test "$python_enable_shared" != 1; then
912-
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
913-
# get set. The file detection logic below doesn't succeed on
914-
# older OS X versions, so make it explicit.
915912
if test "$PORTNAME" = darwin; then
913+
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
914+
# not get set. The file detection logic below doesn't succeed
915+
# on older OS X versions, so make it explicit.
916+
python_enable_shared=1
917+
elif test "$PORTNAME" = win32; then
918+
# Windows also needs an explicit override.
916919
python_enable_shared=1
917920
else
918921
# We don't know the platform shared library extension here yet,
919922
# so we try some candidates.
920-
for dlsuffix in .so .dll .sl; do
923+
for dlsuffix in .so .sl; do
921924
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
922925
python_enable_shared=1
923926
break

src/pl/plpython/Makefile

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

0 commit comments

Comments
 (0)