(original) (raw)

--- origsrc/Python-3.2.3/Makefile.pre.in 2012-04-11 02:54:06.000000000 -0400 +++ src/Python-3.2.3/Makefile.pre.in 2012-06-08 16:42:37.501375000 -0400 @@ -506,7 +506,7 @@ # 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: (LIBRARYOBJS)+(LIBRARY_OBJS) +(LIBRARYOBJS)+(DLLLIBRARY) libpython$(LDVERSION).dll.a: (LIBRARYOBJS)iftest−n"(LIBRARY_OBJS) if test -n "(LIBRARYOBJS)iftest−n"(DLLLIBRARY)"; then \ (LDSHARED)−Wl,−−out−implib=(LDSHARED) -Wl,--out-implib=(LDSHARED)−Wl,−−out−implib=@ -o (DLLLIBRARY)(DLLLIBRARY) (DLLLIBRARY)^ \ (LIBS)(LIBS) (LIBS)(MODLIBS) (SYSLIBS)(SYSLIBS) (SYSLIBS)(LDLAST); \ --- origsrc/Python-3.2.3/Lib/distutils/command/build_ext.py 2012-04-11 02:54:02.000000000 -0400 +++ src/Python-3.2.3/Lib/distutils/command/build_ext.py 2012-06-10 22:47:29.735750000 -0400 @@ -720,9 +720,9 @@ # extensions, it is a reference to the original list return ext.libraries + [pythonlib] elif sys.platform[:6] == "cygwin": - template = "python%d.%d" - pythonlib = (template % - (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) + pythonlib = 'python{}.{}{}'.format( + sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff, + sys.abiflags) # don't extend ext.libraries, it may be shared with other # extensions, it is a reference to the original list return ext.libraries + [pythonlib] --- origsrc/Python-3.2.3/Modules/makesetup 2012-04-11 02:54:07.000000000 -0400 +++ src/Python-3.2.3/Modules/makesetup 2012-06-10 21:16:38.923250000 -0400 @@ -91,7 +91,7 @@ else ExtraLibDir='$(LIBPL)' fi - ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";; + ExtraLibs="-L$ExtraLibDir -lpython\$(LDVERSION)";; esac # Main loop