45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
|
|
--- a/Lib/distutils/command/build_ext.py 2013-12-26 18:44:15.668884700 +0000
|
|
+++ b/Lib/distutils/command/build_ext.py 2013-12-26 18:44:19.266090400 +0000
|
|
@@ -728,13 +728,6 @@
|
|
# 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] == "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":
|
|
from distutils import sysconfig
|
|
|
|
diff -urN a/Makefile.pre.in b/Makefile.pre.in
|
|
--- a/Makefile.pre.in 2013-12-26 18:44:16.714944500 +0000
|
|
+++ b/Makefile.pre.in 2013-12-26 18:44:19.268090500 +0000
|
|
@@ -563,9 +563,9 @@
|
|
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
|
|
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
|
|
|
|
-# This rule builds the Cygwin Python DLL and import library if configured
|
|
+# This rule builds the 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 \
|
|
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
|
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
|
diff -urN a/Modules/makesetup b/Modules/makesetup
|
|
--- a/Modules/makesetup 2013-12-26 18:44:16.758947000 +0000
|
|
+++ b/Modules/makesetup 2013-12-26 18:44:19.269090600 +0000
|
|
@@ -91,7 +91,7 @@
|
|
else
|
|
ExtraLibDir='$(LIBPL)'
|
|
fi
|
|
- ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
|
|
+ ExtraLibs="-L$ExtraLibDir -lpython\$(LDVERSION)";;
|
|
esac
|
|
|
|
# Main loop
|