cpython: 5b4c21436036 (original) (raw)

Mercurial > cpython

changeset 104215:5b4c21436036

Issue #13756: Fix building extensions modules on Cygwin Patch by Roumen Petrov, based on original patch by Jason Tishler. [#13756]

Zachary Ware zachary.ware@gmail.com
date	Sat, 01 Oct 2016 16:15:09 -0500
parents	5673cf852daa
children	c2c147bb811a
files	Lib/distutils/command/build_ext.py Makefile.pre.in Misc/NEWS Modules/makesetup
diffstat	4 files changed, 5 insertions(+), 9 deletions(-)[+] [-] Lib/distutils/command/build_ext.py 7 Makefile.pre.in 2 Misc/NEWS 3 Modules/makesetup 2

line wrap: on

line diff

--- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -715,13 +715,6 @@ class build_ext(Command): return ext.libraries + [pythonlib] else: return ext.libraries

   elif sys.platform[:6] == "cygwin":[](#l1.7)

       template = "python%d.%d"[](#l1.8)

```
       pythonlib = (template %[](#l1.9)
```

              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))[](#l1.10)

       # don't extend ext.libraries, it may be shared with other[](#l1.11)

       # extensions, it is a reference to the original list[](#l1.12)

       return ext.libraries + [pythonlib][](#l1.13)
   elif sys.platform[:6] == "atheos":[](#l1.14)
       from distutils import sysconfig[](#l1.15)

--- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -674,7 +674,7 @@ RESSRCDIR=Mac/Resources/framework

This rule builds the Cygwin Python DLL and import library if configured

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 [](#l2.9) (LDSHARED)−Wl,−−out−implib=(LDSHARED) -Wl,--out-implib=(LDSHARED)−Wl,−−out−implib=@ -o (DLLLIBRARY)(DLLLIBRARY) (DLLLIBRARY)^ [](#l2.10) (LIBS)(LIBS) (LIBS)(MODLIBS) (SYSLIBS)(SYSLIBS) (SYSLIBS)(LDLAST); [](#l2.11)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -173,6 +173,9 @@ Windows 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 not provide. Patch by Masayuki Yamamoto with review and rebase by Erik Bray.

--- a/Modules/makesetup +++ b/Modules/makesetup @@ -91,7 +91,7 @@ CYGWIN*) if test $libdir = . else ExtraLibDir='$(LIBPL)' fi - ExtraLibs="-L$ExtraLibDir -lpython$(VERSION)";; + ExtraLibs="-L$ExtraLibDir -lpython$(LDVERSION)";; esac

cpython: 5b4c21436036 (original) (raw)

Mercurial > cpython

changeset 104215:5b4c21436036

This rule builds the Cygwin Python DLL and import library if configured

for a shared core library; otherwise, this rule is a noop.

Main loop