mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
Issue #13756: Fix building extensions modules on Cygwin
Patch by Roumen Petrov, based on original patch by Jason Tishler.
This commit is contained in:
parent
e999e96143
commit
3839d99b79
|
@ -715,13 +715,6 @@ def get_libraries(self, ext):
|
||||||
return ext.libraries + [pythonlib]
|
return ext.libraries + [pythonlib]
|
||||||
else:
|
else:
|
||||||
return ext.libraries
|
return ext.libraries
|
||||||
elif sys.platform[:6] == "cygwin":
|
|
||||||
template = "python%d.%d"
|
|
||||||
pythonlib = (template %
|
|
||||||
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
|
|
||||||
# don't extend ext.libraries, it may be shared with other
|
|
||||||
# extensions, it is a reference to the original list
|
|
||||||
return ext.libraries + [pythonlib]
|
|
||||||
elif sys.platform[:6] == "atheos":
|
elif sys.platform[:6] == "atheos":
|
||||||
from distutils import sysconfig
|
from distutils import sysconfig
|
||||||
|
|
||||||
|
|
|
@ -674,7 +674,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
|
||||||
|
|
||||||
# This rule builds the Cygwin Python DLL and import library if configured
|
# This rule builds the Cygwin Python DLL and import library if configured
|
||||||
# for a shared core library; otherwise, this rule is a noop.
|
# for a shared core library; otherwise, this rule is a noop.
|
||||||
$(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
|
$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
|
||||||
if test -n "$(DLLLIBRARY)"; then \
|
if test -n "$(DLLLIBRARY)"; then \
|
||||||
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
||||||
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
||||||
|
|
|
@ -173,6 +173,9 @@ Windows
|
||||||
Build
|
Build
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
- Issue #13756: Fix building extensions modules on Cygwin. Patch by Roumen
|
||||||
|
Petrov, based on original patch by Jason Tishler.
|
||||||
|
|
||||||
- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
|
- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
|
||||||
not provide. Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
|
not provide. Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ CYGWIN*) if test $libdir = .
|
||||||
else
|
else
|
||||||
ExtraLibDir='$(LIBPL)'
|
ExtraLibDir='$(LIBPL)'
|
||||||
fi
|
fi
|
||||||
ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
|
ExtraLibs="-L$ExtraLibDir -lpython\$(LDVERSION)";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Main loop
|
# Main loop
|
||||||
|
|
Loading…
Reference in a new issue