From 7c1b86923ab6377a867708298c0a010a4f08d8fa Mon Sep 17 00:00:00 2001 From: "Erik M. Bray" Date: Mon, 5 Dec 2016 14:30:08 +0100 Subject: [PATCH 1/2] Add patches to build Pythons 2.7 through 3.5 on Cygwin --- .../2.5.2-ctypes-util-find_library.patch | 0 pkgs/python/{ => 2.7}/2.5.2-tkinter-x11.patch | 0 pkgs/python/{ => 2.7}/2.6.5-FD_SETSIZE.patch | 0 .../2.6.5-export-PySignal_SetWakeupFd.patch | 0 .../python/{ => 2.7}/2.6.5-ncurses-abi6.patch | 0 pkgs/python/{ => 2.7}/2.7.3-dbm.patch | 0 pkgs/python/{ => 2.7}/2.7.3-dylib.patch | 0 .../2.7.3-getpath-exe-extension.patch | 0 pkgs/python/{ => 2.7}/2.7.3-no-libm.patch | 0 pkgs/python/3.2/2.6.5-FD_SETSIZE.patch | 1 + pkgs/python/3.2/2.6.5-ncurses-abi6.patch | 1 + pkgs/python/3.2/2.7.3-dylib.patch | 1 + .../3.2/3.2.6-ctypes-util-find_library.patch | 34 ++++ pkgs/python/3.2/3.2.6-dbm.patch | 29 ++++ .../3.2/3.2.6-export-PyNode_SizeOf.patch | 13 ++ .../3.2.6-export-PySignal_SetWakeupFd.patch | 11 ++ .../3.2/3.2.6-getpath-exe-extension.patch | 31 ++++ pkgs/python/3.2/3.2.6-issue13756.patch | 47 +++++ .../3.2/3.2.6-no-enable-new-dtags.patch | 20 +++ pkgs/python/3.2/3.2.6-no-libm.patch | 11 ++ pkgs/python/3.2/3.2.6-no-native-tls.patch | 101 +++++++++++ pkgs/python/3.2/3.2.6-tkinter-x11.patch | 26 +++ pkgs/python/3.3/2.6.5-FD_SETSIZE.patch | 1 + pkgs/python/3.3/2.6.5-ncurses-abi6.patch | 1 + pkgs/python/3.3/2.7.3-dylib.patch | 1 + .../3.3/3.2.6-ctypes-util-find_library.patch | 1 + .../3.3/3.2.6-export-PyNode_SizeOf.patch | 1 + .../3.2.6-export-PySignal_SetWakeupFd.patch | 1 + .../3.3/3.2.6-getpath-exe-extension.patch | 1 + pkgs/python/3.3/3.2.6-issue13756.patch | 1 + .../3.3/3.2.6-no-enable-new-dtags.patch | 1 + pkgs/python/3.3/3.2.6-no-native-tls.patch | 1 + pkgs/python/3.3/3.3.6-dbm.patch | 29 ++++ pkgs/python/3.3/3.3.6-no-libm.patch | 13 ++ .../3.3/3.3.6-struct_siginfo_si_band.patch | 66 +++++++ pkgs/python/3.3/3.3.6-tkinter-x11.patch | 28 +++ pkgs/python/3.4/2.6.5-FD_SETSIZE.patch | 1 + pkgs/python/3.4/2.6.5-ncurses-abi6.patch | 1 + pkgs/python/3.4/2.7.3-dylib.patch | 1 + .../3.4/3.2.6-ctypes-util-find_library.patch | 1 + .../3.2.6-export-PySignal_SetWakeupFd.patch | 1 + .../3.4/3.2.6-getpath-exe-extension.patch | 1 + .../3.4/3.2.6-no-enable-new-dtags.patch | 1 + pkgs/python/3.4/3.2.6-no-native-tls.patch | 1 + pkgs/python/3.4/3.3.6-dbm.patch | 1 + pkgs/python/3.4/3.3.6-no-libm.patch | 1 + .../3.4/3.3.6-struct_siginfo_si_band.patch | 1 + pkgs/python/3.4/3.3.6-tkinter-x11.patch | 1 + pkgs/python/3.4/3.4.5-issue13756.patch | 44 +++++ pkgs/python/3.4/3.4.5-struct.patch | 13 ++ pkgs/python/3.5/2.6.5-FD_SETSIZE.patch | 1 + pkgs/python/3.5/2.6.5-ncurses-abi6.patch | 1 + pkgs/python/3.5/2.7.3-dylib.patch | 1 + .../3.5/3.2.6-ctypes-util-find_library.patch | 1 + .../3.2.6-export-PySignal_SetWakeupFd.patch | 1 + .../3.5/3.2.6-getpath-exe-extension.patch | 1 + .../3.5/3.2.6-no-enable-new-dtags.patch | 1 + pkgs/python/3.5/3.2.6-no-native-tls.patch | 1 + pkgs/python/3.5/3.3.6-dbm.patch | 1 + pkgs/python/3.5/3.3.6-tkinter-x11.patch | 1 + pkgs/python/3.5/3.4.5-issue13756.patch | 1 + pkgs/python/3.5/3.4.5-struct.patch | 1 + pkgs/python/3.5/3.5.2-no-libm.patch | 15 ++ .../3.5/3.5.2-struct_siginfo_si_band.patch | 66 +++++++ pkgs/python/python.yaml | 162 ++++++++++++++++-- 65 files changed, 786 insertions(+), 10 deletions(-) rename pkgs/python/{ => 2.7}/2.5.2-ctypes-util-find_library.patch (100%) rename pkgs/python/{ => 2.7}/2.5.2-tkinter-x11.patch (100%) rename pkgs/python/{ => 2.7}/2.6.5-FD_SETSIZE.patch (100%) rename pkgs/python/{ => 2.7}/2.6.5-export-PySignal_SetWakeupFd.patch (100%) rename pkgs/python/{ => 2.7}/2.6.5-ncurses-abi6.patch (100%) rename pkgs/python/{ => 2.7}/2.7.3-dbm.patch (100%) rename pkgs/python/{ => 2.7}/2.7.3-dylib.patch (100%) rename pkgs/python/{ => 2.7}/2.7.3-getpath-exe-extension.patch (100%) rename pkgs/python/{ => 2.7}/2.7.3-no-libm.patch (100%) create mode 120000 pkgs/python/3.2/2.6.5-FD_SETSIZE.patch create mode 120000 pkgs/python/3.2/2.6.5-ncurses-abi6.patch create mode 120000 pkgs/python/3.2/2.7.3-dylib.patch create mode 100644 pkgs/python/3.2/3.2.6-ctypes-util-find_library.patch create mode 100644 pkgs/python/3.2/3.2.6-dbm.patch create mode 100644 pkgs/python/3.2/3.2.6-export-PyNode_SizeOf.patch create mode 100644 pkgs/python/3.2/3.2.6-export-PySignal_SetWakeupFd.patch create mode 100644 pkgs/python/3.2/3.2.6-getpath-exe-extension.patch create mode 100644 pkgs/python/3.2/3.2.6-issue13756.patch create mode 100644 pkgs/python/3.2/3.2.6-no-enable-new-dtags.patch create mode 100644 pkgs/python/3.2/3.2.6-no-libm.patch create mode 100644 pkgs/python/3.2/3.2.6-no-native-tls.patch create mode 100644 pkgs/python/3.2/3.2.6-tkinter-x11.patch create mode 120000 pkgs/python/3.3/2.6.5-FD_SETSIZE.patch create mode 120000 pkgs/python/3.3/2.6.5-ncurses-abi6.patch create mode 120000 pkgs/python/3.3/2.7.3-dylib.patch create mode 120000 pkgs/python/3.3/3.2.6-ctypes-util-find_library.patch create mode 120000 pkgs/python/3.3/3.2.6-export-PyNode_SizeOf.patch create mode 120000 pkgs/python/3.3/3.2.6-export-PySignal_SetWakeupFd.patch create mode 120000 pkgs/python/3.3/3.2.6-getpath-exe-extension.patch create mode 120000 pkgs/python/3.3/3.2.6-issue13756.patch create mode 120000 pkgs/python/3.3/3.2.6-no-enable-new-dtags.patch create mode 120000 pkgs/python/3.3/3.2.6-no-native-tls.patch create mode 100644 pkgs/python/3.3/3.3.6-dbm.patch create mode 100644 pkgs/python/3.3/3.3.6-no-libm.patch create mode 100644 pkgs/python/3.3/3.3.6-struct_siginfo_si_band.patch create mode 100644 pkgs/python/3.3/3.3.6-tkinter-x11.patch create mode 120000 pkgs/python/3.4/2.6.5-FD_SETSIZE.patch create mode 120000 pkgs/python/3.4/2.6.5-ncurses-abi6.patch create mode 120000 pkgs/python/3.4/2.7.3-dylib.patch create mode 120000 pkgs/python/3.4/3.2.6-ctypes-util-find_library.patch create mode 120000 pkgs/python/3.4/3.2.6-export-PySignal_SetWakeupFd.patch create mode 120000 pkgs/python/3.4/3.2.6-getpath-exe-extension.patch create mode 120000 pkgs/python/3.4/3.2.6-no-enable-new-dtags.patch create mode 120000 pkgs/python/3.4/3.2.6-no-native-tls.patch create mode 120000 pkgs/python/3.4/3.3.6-dbm.patch create mode 120000 pkgs/python/3.4/3.3.6-no-libm.patch create mode 120000 pkgs/python/3.4/3.3.6-struct_siginfo_si_band.patch create mode 120000 pkgs/python/3.4/3.3.6-tkinter-x11.patch create mode 100644 pkgs/python/3.4/3.4.5-issue13756.patch create mode 100644 pkgs/python/3.4/3.4.5-struct.patch create mode 120000 pkgs/python/3.5/2.6.5-FD_SETSIZE.patch create mode 120000 pkgs/python/3.5/2.6.5-ncurses-abi6.patch create mode 120000 pkgs/python/3.5/2.7.3-dylib.patch create mode 120000 pkgs/python/3.5/3.2.6-ctypes-util-find_library.patch create mode 120000 pkgs/python/3.5/3.2.6-export-PySignal_SetWakeupFd.patch create mode 120000 pkgs/python/3.5/3.2.6-getpath-exe-extension.patch create mode 120000 pkgs/python/3.5/3.2.6-no-enable-new-dtags.patch create mode 120000 pkgs/python/3.5/3.2.6-no-native-tls.patch create mode 120000 pkgs/python/3.5/3.3.6-dbm.patch create mode 120000 pkgs/python/3.5/3.3.6-tkinter-x11.patch create mode 120000 pkgs/python/3.5/3.4.5-issue13756.patch create mode 120000 pkgs/python/3.5/3.4.5-struct.patch create mode 100644 pkgs/python/3.5/3.5.2-no-libm.patch create mode 100644 pkgs/python/3.5/3.5.2-struct_siginfo_si_band.patch diff --git a/pkgs/python/2.5.2-ctypes-util-find_library.patch b/pkgs/python/2.7/2.5.2-ctypes-util-find_library.patch similarity index 100% rename from pkgs/python/2.5.2-ctypes-util-find_library.patch rename to pkgs/python/2.7/2.5.2-ctypes-util-find_library.patch diff --git a/pkgs/python/2.5.2-tkinter-x11.patch b/pkgs/python/2.7/2.5.2-tkinter-x11.patch similarity index 100% rename from pkgs/python/2.5.2-tkinter-x11.patch rename to pkgs/python/2.7/2.5.2-tkinter-x11.patch diff --git a/pkgs/python/2.6.5-FD_SETSIZE.patch b/pkgs/python/2.7/2.6.5-FD_SETSIZE.patch similarity index 100% rename from pkgs/python/2.6.5-FD_SETSIZE.patch rename to pkgs/python/2.7/2.6.5-FD_SETSIZE.patch diff --git a/pkgs/python/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch similarity index 100% rename from pkgs/python/2.6.5-export-PySignal_SetWakeupFd.patch rename to pkgs/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch diff --git a/pkgs/python/2.6.5-ncurses-abi6.patch b/pkgs/python/2.7/2.6.5-ncurses-abi6.patch similarity index 100% rename from pkgs/python/2.6.5-ncurses-abi6.patch rename to pkgs/python/2.7/2.6.5-ncurses-abi6.patch diff --git a/pkgs/python/2.7.3-dbm.patch b/pkgs/python/2.7/2.7.3-dbm.patch similarity index 100% rename from pkgs/python/2.7.3-dbm.patch rename to pkgs/python/2.7/2.7.3-dbm.patch diff --git a/pkgs/python/2.7.3-dylib.patch b/pkgs/python/2.7/2.7.3-dylib.patch similarity index 100% rename from pkgs/python/2.7.3-dylib.patch rename to pkgs/python/2.7/2.7.3-dylib.patch diff --git a/pkgs/python/2.7.3-getpath-exe-extension.patch b/pkgs/python/2.7/2.7.3-getpath-exe-extension.patch similarity index 100% rename from pkgs/python/2.7.3-getpath-exe-extension.patch rename to pkgs/python/2.7/2.7.3-getpath-exe-extension.patch diff --git a/pkgs/python/2.7.3-no-libm.patch b/pkgs/python/2.7/2.7.3-no-libm.patch similarity index 100% rename from pkgs/python/2.7.3-no-libm.patch rename to pkgs/python/2.7/2.7.3-no-libm.patch diff --git a/pkgs/python/3.2/2.6.5-FD_SETSIZE.patch b/pkgs/python/3.2/2.6.5-FD_SETSIZE.patch new file mode 120000 index 000000000..4c1ac1be6 --- /dev/null +++ b/pkgs/python/3.2/2.6.5-FD_SETSIZE.patch @@ -0,0 +1 @@ +../2.7/2.6.5-FD_SETSIZE.patch \ No newline at end of file diff --git a/pkgs/python/3.2/2.6.5-ncurses-abi6.patch b/pkgs/python/3.2/2.6.5-ncurses-abi6.patch new file mode 120000 index 000000000..88c29fcee --- /dev/null +++ b/pkgs/python/3.2/2.6.5-ncurses-abi6.patch @@ -0,0 +1 @@ +../2.7/2.6.5-ncurses-abi6.patch \ No newline at end of file diff --git a/pkgs/python/3.2/2.7.3-dylib.patch b/pkgs/python/3.2/2.7.3-dylib.patch new file mode 120000 index 000000000..e85449b0c --- /dev/null +++ b/pkgs/python/3.2/2.7.3-dylib.patch @@ -0,0 +1 @@ +../2.7/2.7.3-dylib.patch \ No newline at end of file diff --git a/pkgs/python/3.2/3.2.6-ctypes-util-find_library.patch b/pkgs/python/3.2/3.2.6-ctypes-util-find_library.patch new file mode 100644 index 000000000..f10f97ba8 --- /dev/null +++ b/pkgs/python/3.2/3.2.6-ctypes-util-find_library.patch @@ -0,0 +1,34 @@ +--- Lib/ctypes/util.py ++++ Lib/ctypes/util.py +@@ -82,6 +82,20 @@ if os.name == "posix" and sys.platform == "darwin": + continue + return None + ++elif sys.platform == "cygwin": ++ def find_library(name): ++ for libdir in ['/usr/lib', '/usr/local/lib']: ++ for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]: ++ implib = os.path.join(libdir, libext) ++ if not os.path.exists(implib): ++ continue ++ cmd = "dlltool -I " + implib + " 2>/dev/null" ++ res = os.popen(cmd).read().replace("\n","") ++ if not res: ++ continue ++ return res ++ return None ++ + elif os.name == "posix": + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile, errno +@@ -224,6 +238,10 @@ def test(): + print(cdll.LoadLibrary("libcrypto.dylib")) + print(cdll.LoadLibrary("libSystem.dylib")) + print(cdll.LoadLibrary("System.framework/System")) ++ elif sys.platform == "cygwin": ++ print cdll.LoadLibrary("cygbz2-1.dll") ++ print find_library("crypt") ++ print cdll.LoadLibrary("cygcrypt-0.dll") + else: + print(cdll.LoadLibrary("libm.so")) + print(cdll.LoadLibrary("libcrypt.so")) diff --git a/pkgs/python/3.2/3.2.6-dbm.patch b/pkgs/python/3.2/3.2.6-dbm.patch new file mode 100644 index 000000000..70e37eb61 --- /dev/null +++ b/pkgs/python/3.2/3.2.6-dbm.patch @@ -0,0 +1,29 @@ +diff --git setup.py setup.py +index 3b78c70..0d911e8 100644 +--- setup.py ++++ setup.py +@@ -1081,7 +1081,7 @@ class PyBuildExt(build_ext): + + dbm_order = ['gdbm'] + # The standard Unix dbm module: +- if platform not in ['cygwin']: ++ if platform not in ['win32']: + config_args = [arg.strip("'") + for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] + dbm_args = [arg for arg in config_args +@@ -1136,6 +1136,15 @@ class PyBuildExt(build_ext): + ], + libraries = gdbm_libs) + break ++ if find_file("ndbm.h", inc_dirs, []) is not None: ++ print("building dbm using gdbm") ++ dbmext = Extension( ++ '_dbm', ['_dbmmodule.c'], ++ define_macros=[ ++ ('HAVE_NDBM_H', None), ++ ], ++ libraries = gdbm_libs) ++ break + elif cand == "bdb": + if db_incs is not None: + print("building dbm using bdb") diff --git a/pkgs/python/3.2/3.2.6-export-PyNode_SizeOf.patch b/pkgs/python/3.2/3.2.6-export-PyNode_SizeOf.patch new file mode 100644 index 000000000..a29a1f95e --- /dev/null +++ b/pkgs/python/3.2/3.2.6-export-PyNode_SizeOf.patch @@ -0,0 +1,13 @@ +diff --git Include/node.h Include/node.h +index 9f6760c..2cde3b9 100644 +--- Include/node.h ++++ Include/node.h +@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n, int type, + char *str, int lineno, int col_offset); + PyAPI_FUNC(void) PyNode_Free(node *n); + #ifndef Py_LIMITED_API +-Py_ssize_t _PyNode_SizeOf(node *n); ++PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n); + #endif + + /* Node access functions */ diff --git a/pkgs/python/3.2/3.2.6-export-PySignal_SetWakeupFd.patch b/pkgs/python/3.2/3.2.6-export-PySignal_SetWakeupFd.patch new file mode 100644 index 000000000..db46f00ec --- /dev/null +++ b/pkgs/python/3.2/3.2.6-export-PySignal_SetWakeupFd.patch @@ -0,0 +1,11 @@ +--- Include/pyerrors.h ++++ Include/pyerrors.h +@@ -244,7 +244,7 @@ PyAPI_FUNC(void) PyErr_SetInterrupt(void); + + /* In signalmodule.c */ + #ifndef Py_LIMITED_API +-int PySignal_SetWakeupFd(int fd); ++PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd); + #endif + + /* Support for adding program text to SyntaxErrors */ diff --git a/pkgs/python/3.2/3.2.6-getpath-exe-extension.patch b/pkgs/python/3.2/3.2.6-getpath-exe-extension.patch new file mode 100644 index 000000000..2f1b634eb --- /dev/null +++ b/pkgs/python/3.2/3.2.6-getpath-exe-extension.patch @@ -0,0 +1,31 @@ +--- Modules/getpath.c ++++ Modules/getpath.c +@@ -491,6 +491,28 @@ calculate_path(void) + if (isxfile(progpath)) + break; + ++#ifdef __CYGWIN__ ++ /* ++ * Cygwin automatically removes the ".exe" extension from argv[0] ++ * to make programs feel like they are in a more Unix-like ++ * environment. Unfortunately, this can make it problemmatic for ++ * Cygwin to distinguish between a directory and an executable with ++ * the same name excluding the ".exe" extension. For example, the ++ * Cygwin Python build directory has a "Python" directory and a ++ * "python.exe" executable. This causes isxfile() to erroneously ++ * return false. If isdir() returns true and there is enough space ++ * to append the ".exe" extension, then we try again with the ++ * extension appended. ++ */ ++#define EXE ".exe" ++ if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN) ++ { ++ strcat(progpath, EXE); ++ if (isxfile(progpath)) ++ break; ++ } ++#endif /* __CYGWIN__ */ ++ + if (!delim) { + progpath[0] = L'\0'; + break; diff --git a/pkgs/python/3.2/3.2.6-issue13756.patch b/pkgs/python/3.2/3.2.6-issue13756.patch new file mode 100644 index 000000000..68b15530b --- /dev/null +++ b/pkgs/python/3.2/3.2.6-issue13756.patch @@ -0,0 +1,47 @@ +diff --git Lib/distutils/command/build_ext.py Lib/distutils/command/build_ext.py +index 64f634c..89ed2ab 100644 +--- Lib/distutils/command/build_ext.py ++++ Lib/distutils/command/build_ext.py +@@ -719,13 +719,6 @@ class build_ext(Command): + # 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 --git Makefile.pre.in Makefile.pre.in +index 5260e6b..eb4fac4 100644 +--- Makefile.pre.in ++++ Makefile.pre.in +@@ -520,9 +520,9 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ + $(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 --git Modules/makesetup Modules/makesetup +index 40dfa9d..1a1fcf6 100755 +--- Modules/makesetup ++++ 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 + + # Main loop diff --git a/pkgs/python/3.2/3.2.6-no-enable-new-dtags.patch b/pkgs/python/3.2/3.2.6-no-enable-new-dtags.patch new file mode 100644 index 000000000..4b1057a8a --- /dev/null +++ b/pkgs/python/3.2/3.2.6-no-enable-new-dtags.patch @@ -0,0 +1,20 @@ +diff --git Lib/distutils/unixccompiler.py Lib/distutils/unixccompiler.py +index 69045f8..7ed0a5f 100644 +--- Lib/distutils/unixccompiler.py ++++ Lib/distutils/unixccompiler.py +@@ -239,9 +239,13 @@ class UnixCCompiler(CCompiler): + # -Wl whenever gcc was used in the past it is probably + # safest to keep doing so. + if sysconfig.get_config_var("GNULD") == "yes": +- # GNU ld needs an extra option to get a RUNPATH ++ # GNU ELF ld needs an extra option to get a RUNPATH + # instead of just an RPATH. +- return "-Wl,--enable-new-dtags,-R" + dir ++ if sys.platform in ["win32", "cygwin"] or \ ++ "mingw" in compiler: ++ return [] ++ else: ++ return "-Wl,--enable-new-dtags,-R" + dir + else: + return "-Wl,-R" + dir + else: diff --git a/pkgs/python/3.2/3.2.6-no-libm.patch b/pkgs/python/3.2/3.2.6-no-libm.patch new file mode 100644 index 000000000..c854aefd0 --- /dev/null +++ b/pkgs/python/3.2/3.2.6-no-libm.patch @@ -0,0 +1,11 @@ +--- setup.py ++++ setup.py +@@ -508,7 +508,7 @@ class PyBuildExt(build_ext): + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if platform == 'darwin': ++ if platform in ['darwin', 'cygwin']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules diff --git a/pkgs/python/3.2/3.2.6-no-native-tls.patch b/pkgs/python/3.2/3.2.6-no-native-tls.patch new file mode 100644 index 000000000..80a00a9bf --- /dev/null +++ b/pkgs/python/3.2/3.2.6-no-native-tls.patch @@ -0,0 +1,101 @@ +diff --git Python/thread_pthread.h Python/thread_pthread.h +index de42f1a..a4eab78 100644 +--- Python/thread_pthread.h ++++ Python/thread_pthread.h +@@ -601,6 +601,12 @@ _pythread_pthread_set_stacksize(size_t size) + + #define THREAD_SET_STACKSIZE(x) _pythread_pthread_set_stacksize(x) + ++ ++/* Issue #25658: POSIX doesn't require that pthread_key_t is integer. ++ If key type isn't integer, TLS functions are implemented by CPython self. ++*/ ++#ifdef PTHREAD_KEY_T_IS_INTEGER ++ + #define Py_HAVE_NATIVE_TLS + + int +@@ -643,3 +649,5 @@ PyThread_get_key_value(int key) + void + PyThread_ReInitTLS(void) + {} ++ ++#endif /* PTHREAD_KEY_T_IS_INTEGER */ +diff --git configure configure +index b107bf2..59f80cb 100755 +--- configure ++++ configure +@@ -7564,6 +7564,35 @@ _ACEOF + + + fi ++ ++# Issue #25658: POSIX doesn't require that pthread_key_t is integer. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_key_t is integer" >&5 ++$as_echo_n "checking whether pthread_key_t is integer... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++pthread_key_t k; k * 1; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_pthread_key_t_is_integer=yes ++else ++ ac_pthread_key_t_is_integer=no ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_key_t_is_integer" >&5 ++$as_echo "$ac_pthread_key_t_is_integer" >&6; } ++if test "$ac_pthread_key_t_is_integer" = yes ; then ++ ++$as_echo "#define PTHREAD_KEY_T_IS_INTEGER 1" >>confdefs.h ++ ++fi + CC="$ac_save_cc" + + +diff --git configure.ac configure.ac +index 0ab4430..89e422a 100644 +--- configure.ac ++++ configure.ac +@@ -1610,6 +1610,19 @@ if test "$have_pthread_t" = yes ; then + #endif + ]) + fi ++ ++# Issue #25658: POSIX doesn't require that pthread_key_t is integer. ++AC_MSG_CHECKING(whether pthread_key_t is integer) ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[#include ]], [[pthread_key_t k; k * 1;]])], ++ [ac_pthread_key_t_is_integer=yes], ++ [ac_pthread_key_t_is_integer=no] ++) ++AC_MSG_RESULT($ac_pthread_key_t_is_integer) ++if test "$ac_pthread_key_t_is_integer" = yes ; then ++ AC_DEFINE(PTHREAD_KEY_T_IS_INTEGER, 1, ++ [Define if pthread_key_t is integer.]) ++fi + CC="$ac_save_cc" + + AC_SUBST(OTHER_LIBTOOL_OPT) +diff --git pyconfig.h.in pyconfig.h.in +index cf0ea1f..0bd8387 100644 +--- pyconfig.h.in ++++ pyconfig.h.in +@@ -973,6 +973,9 @@ + /* Define if POSIX semaphores aren't enabled on your system */ + #undef POSIX_SEMAPHORES_NOT_ENABLED + ++/* Define if pthread_key_t is integer. */ ++#undef PTHREAD_KEY_T_IS_INTEGER ++ + /* Defined if PTHREAD_SCOPE_SYSTEM supported. */ + #undef PTHREAD_SYSTEM_SCHED_SUPPORTED + diff --git a/pkgs/python/3.2/3.2.6-tkinter-x11.patch b/pkgs/python/3.2/3.2.6-tkinter-x11.patch new file mode 100644 index 000000000..49fb2e9ac --- /dev/null +++ b/pkgs/python/3.2/3.2.6-tkinter-x11.patch @@ -0,0 +1,26 @@ +--- setup.py ++++ setup.py +@@ -1606,12 +1606,6 @@ class PyBuildExt(build_ext): + include_dirs.append('/usr/X11/include') + added_lib_dirs.append('/usr/X11/lib') + +- # If Cygwin, then verify that X is installed before proceeding +- if platform == 'cygwin': +- x11_inc = find_file('X11/Xlib.h', [], include_dirs) +- if x11_inc is None: +- return +- + # Check for BLT extension + if self.compiler.find_library_file(lib_dirs + added_lib_dirs, + 'BLT8.0'): +@@ -1629,9 +1623,7 @@ class PyBuildExt(build_ext): + if platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if platform != "cygwin": +- libs.append('X11') ++ libs.append('X11') + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, diff --git a/pkgs/python/3.3/2.6.5-FD_SETSIZE.patch b/pkgs/python/3.3/2.6.5-FD_SETSIZE.patch new file mode 120000 index 000000000..4c1ac1be6 --- /dev/null +++ b/pkgs/python/3.3/2.6.5-FD_SETSIZE.patch @@ -0,0 +1 @@ +../2.7/2.6.5-FD_SETSIZE.patch \ No newline at end of file diff --git a/pkgs/python/3.3/2.6.5-ncurses-abi6.patch b/pkgs/python/3.3/2.6.5-ncurses-abi6.patch new file mode 120000 index 000000000..88c29fcee --- /dev/null +++ b/pkgs/python/3.3/2.6.5-ncurses-abi6.patch @@ -0,0 +1 @@ +../2.7/2.6.5-ncurses-abi6.patch \ No newline at end of file diff --git a/pkgs/python/3.3/2.7.3-dylib.patch b/pkgs/python/3.3/2.7.3-dylib.patch new file mode 120000 index 000000000..e85449b0c --- /dev/null +++ b/pkgs/python/3.3/2.7.3-dylib.patch @@ -0,0 +1 @@ +../2.7/2.7.3-dylib.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-ctypes-util-find_library.patch b/pkgs/python/3.3/3.2.6-ctypes-util-find_library.patch new file mode 120000 index 000000000..84d439af5 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-ctypes-util-find_library.patch @@ -0,0 +1 @@ +../3.2/3.2.6-ctypes-util-find_library.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-export-PyNode_SizeOf.patch b/pkgs/python/3.3/3.2.6-export-PyNode_SizeOf.patch new file mode 120000 index 000000000..12783d4c1 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-export-PyNode_SizeOf.patch @@ -0,0 +1 @@ +../3.2/3.2.6-export-PyNode_SizeOf.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-export-PySignal_SetWakeupFd.patch b/pkgs/python/3.3/3.2.6-export-PySignal_SetWakeupFd.patch new file mode 120000 index 000000000..33a316868 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-export-PySignal_SetWakeupFd.patch @@ -0,0 +1 @@ +../3.2/3.2.6-export-PySignal_SetWakeupFd.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-getpath-exe-extension.patch b/pkgs/python/3.3/3.2.6-getpath-exe-extension.patch new file mode 120000 index 000000000..515ccd302 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-getpath-exe-extension.patch @@ -0,0 +1 @@ +../3.2/3.2.6-getpath-exe-extension.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-issue13756.patch b/pkgs/python/3.3/3.2.6-issue13756.patch new file mode 120000 index 000000000..6eec5ed86 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-issue13756.patch @@ -0,0 +1 @@ +../3.2/3.2.6-issue13756.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-no-enable-new-dtags.patch b/pkgs/python/3.3/3.2.6-no-enable-new-dtags.patch new file mode 120000 index 000000000..9268dd9fe --- /dev/null +++ b/pkgs/python/3.3/3.2.6-no-enable-new-dtags.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-enable-new-dtags.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.2.6-no-native-tls.patch b/pkgs/python/3.3/3.2.6-no-native-tls.patch new file mode 120000 index 000000000..26507a8e6 --- /dev/null +++ b/pkgs/python/3.3/3.2.6-no-native-tls.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-native-tls.patch \ No newline at end of file diff --git a/pkgs/python/3.3/3.3.6-dbm.patch b/pkgs/python/3.3/3.3.6-dbm.patch new file mode 100644 index 000000000..069e7ceb5 --- /dev/null +++ b/pkgs/python/3.3/3.3.6-dbm.patch @@ -0,0 +1,29 @@ +diff --git setup.py setup.py +index d594e02..e34994d 100644 +--- setup.py ++++ setup.py +@@ -1136,7 +1136,7 @@ class PyBuildExt(build_ext): + dbm_setup_debug = False # verbose debug prints from this script? + dbm_order = ['gdbm'] + # The standard Unix dbm module: +- if host_platform not in ['cygwin']: ++ if host_platform not in ['win32']: + config_args = [arg.strip("'") + for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] + dbm_args = [arg for arg in config_args +@@ -1191,6 +1191,15 @@ class PyBuildExt(build_ext): + ], + libraries = gdbm_libs) + break ++ if find_file("ndbm.h", inc_dirs, []) is not None: ++ print("building dbm using gdbm") ++ dbmext = Extension( ++ '_dbm', ['_dbmmodule.c'], ++ define_macros=[ ++ ('HAVE_NDBM_H', None), ++ ], ++ libraries = gdbm_libs) ++ break + elif cand == "bdb": + if db_incs is not None: + if dbm_setup_debug: print("building dbm using bdb") diff --git a/pkgs/python/3.3/3.3.6-no-libm.patch b/pkgs/python/3.3/3.3.6-no-libm.patch new file mode 100644 index 000000000..871f98a1e --- /dev/null +++ b/pkgs/python/3.3/3.3.6-no-libm.patch @@ -0,0 +1,13 @@ +diff --git setup.py setup.py +index e34994d..3373dd6 100644 +--- setup.py ++++ setup.py +@@ -540,7 +540,7 @@ class PyBuildExt(build_ext): + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if host_platform == 'darwin': ++ if host_platform in ['darwin', 'cygwin']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules diff --git a/pkgs/python/3.3/3.3.6-struct_siginfo_si_band.patch b/pkgs/python/3.3/3.3.6-struct_siginfo_si_band.patch new file mode 100644 index 000000000..937334d7d --- /dev/null +++ b/pkgs/python/3.3/3.3.6-struct_siginfo_si_band.patch @@ -0,0 +1,66 @@ +diff --git Modules/signalmodule.c Modules/signalmodule.c +index 704c9f5..a236bb0 100644 +--- Modules/signalmodule.c ++++ Modules/signalmodule.c +@@ -742,7 +742,11 @@ fill_siginfo(siginfo_t *si) + PyStructSequence_SET_ITEM(result, 4, _PyLong_FromUid(si->si_uid)); + PyStructSequence_SET_ITEM(result, 5, + PyLong_FromLong((long)(si->si_status))); ++#ifdef HAVE_SIGINFO_T_SI_BAND + PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(si->si_band)); ++#else ++ PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(0L)); ++#endif + if (PyErr_Occurred()) { + Py_DECREF(result); + return NULL; +diff --git configure configure +index 6dde687..765e796 100755 +--- configure ++++ configure +@@ -12100,6 +12100,18 @@ esac + fi + + ++# Issue #21085: In Cygwin, siginfo_t does not have si_band field. ++ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include ++" ++if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_SIGINFO_T_SI_BAND 1 ++_ACEOF ++ ++ ++fi ++ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 + $as_echo_n "checking for time.h that defines altzone... " >&6; } +diff --git configure.ac configure.ac +index 760b37f..1825a38 100644 +--- configure.ac ++++ configure.ac +@@ -3317,6 +3317,8 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) + AC_CHECK_MEMBERS([struct stat.st_gen]) + AC_CHECK_MEMBERS([struct stat.st_birthtime]) + AC_STRUCT_ST_BLOCKS ++# Issue #21085: In Cygwin, siginfo_t does not have si_band field. ++AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[#include ]]) + + AC_MSG_CHECKING(for time.h that defines altzone) + AC_CACHE_VAL(ac_cv_header_time_altzone,[ +diff --git pyconfig.h.in pyconfig.h.in +index 77e98e4..313ff6d 100644 +--- pyconfig.h.in ++++ pyconfig.h.in +@@ -795,6 +795,9 @@ + /* Define to 1 if you have the `sigaltstack' function. */ + #undef HAVE_SIGALTSTACK + ++/* Define to 1 if `si_band' is a member of `siginfo_t'. */ ++#undef HAVE_SIGINFO_T_SI_BAND ++ + /* Define to 1 if you have the `siginterrupt' function. */ + #undef HAVE_SIGINTERRUPT + diff --git a/pkgs/python/3.3/3.3.6-tkinter-x11.patch b/pkgs/python/3.3/3.3.6-tkinter-x11.patch new file mode 100644 index 000000000..58fac77a9 --- /dev/null +++ b/pkgs/python/3.3/3.3.6-tkinter-x11.patch @@ -0,0 +1,28 @@ +diff --git setup.py setup.py +index 3373dd6..9d1844b 100644 +--- setup.py ++++ setup.py +@@ -1747,12 +1747,6 @@ class PyBuildExt(build_ext): + include_dirs.append('/usr/X11/include') + added_lib_dirs.append('/usr/X11/lib') + +- # If Cygwin, then verify that X is installed before proceeding +- if host_platform == 'cygwin': +- x11_inc = find_file('X11/Xlib.h', [], include_dirs) +- if x11_inc is None: +- return +- + # Check for BLT extension + if self.compiler.find_library_file(lib_dirs + added_lib_dirs, + 'BLT8.0'): +@@ -1770,9 +1764,7 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') ++ libs.append('X11') + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, diff --git a/pkgs/python/3.4/2.6.5-FD_SETSIZE.patch b/pkgs/python/3.4/2.6.5-FD_SETSIZE.patch new file mode 120000 index 000000000..4c1ac1be6 --- /dev/null +++ b/pkgs/python/3.4/2.6.5-FD_SETSIZE.patch @@ -0,0 +1 @@ +../2.7/2.6.5-FD_SETSIZE.patch \ No newline at end of file diff --git a/pkgs/python/3.4/2.6.5-ncurses-abi6.patch b/pkgs/python/3.4/2.6.5-ncurses-abi6.patch new file mode 120000 index 000000000..88c29fcee --- /dev/null +++ b/pkgs/python/3.4/2.6.5-ncurses-abi6.patch @@ -0,0 +1 @@ +../2.7/2.6.5-ncurses-abi6.patch \ No newline at end of file diff --git a/pkgs/python/3.4/2.7.3-dylib.patch b/pkgs/python/3.4/2.7.3-dylib.patch new file mode 120000 index 000000000..e85449b0c --- /dev/null +++ b/pkgs/python/3.4/2.7.3-dylib.patch @@ -0,0 +1 @@ +../2.7/2.7.3-dylib.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.2.6-ctypes-util-find_library.patch b/pkgs/python/3.4/3.2.6-ctypes-util-find_library.patch new file mode 120000 index 000000000..84d439af5 --- /dev/null +++ b/pkgs/python/3.4/3.2.6-ctypes-util-find_library.patch @@ -0,0 +1 @@ +../3.2/3.2.6-ctypes-util-find_library.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.2.6-export-PySignal_SetWakeupFd.patch b/pkgs/python/3.4/3.2.6-export-PySignal_SetWakeupFd.patch new file mode 120000 index 000000000..33a316868 --- /dev/null +++ b/pkgs/python/3.4/3.2.6-export-PySignal_SetWakeupFd.patch @@ -0,0 +1 @@ +../3.2/3.2.6-export-PySignal_SetWakeupFd.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.2.6-getpath-exe-extension.patch b/pkgs/python/3.4/3.2.6-getpath-exe-extension.patch new file mode 120000 index 000000000..515ccd302 --- /dev/null +++ b/pkgs/python/3.4/3.2.6-getpath-exe-extension.patch @@ -0,0 +1 @@ +../3.2/3.2.6-getpath-exe-extension.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.2.6-no-enable-new-dtags.patch b/pkgs/python/3.4/3.2.6-no-enable-new-dtags.patch new file mode 120000 index 000000000..9268dd9fe --- /dev/null +++ b/pkgs/python/3.4/3.2.6-no-enable-new-dtags.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-enable-new-dtags.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.2.6-no-native-tls.patch b/pkgs/python/3.4/3.2.6-no-native-tls.patch new file mode 120000 index 000000000..26507a8e6 --- /dev/null +++ b/pkgs/python/3.4/3.2.6-no-native-tls.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-native-tls.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.3.6-dbm.patch b/pkgs/python/3.4/3.3.6-dbm.patch new file mode 120000 index 000000000..aa9cd10ab --- /dev/null +++ b/pkgs/python/3.4/3.3.6-dbm.patch @@ -0,0 +1 @@ +../3.3/3.3.6-dbm.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.3.6-no-libm.patch b/pkgs/python/3.4/3.3.6-no-libm.patch new file mode 120000 index 000000000..5e63e8d75 --- /dev/null +++ b/pkgs/python/3.4/3.3.6-no-libm.patch @@ -0,0 +1 @@ +../3.3/3.3.6-no-libm.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.3.6-struct_siginfo_si_band.patch b/pkgs/python/3.4/3.3.6-struct_siginfo_si_band.patch new file mode 120000 index 000000000..53af92dc3 --- /dev/null +++ b/pkgs/python/3.4/3.3.6-struct_siginfo_si_band.patch @@ -0,0 +1 @@ +../3.3/3.3.6-struct_siginfo_si_band.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.3.6-tkinter-x11.patch b/pkgs/python/3.4/3.3.6-tkinter-x11.patch new file mode 120000 index 000000000..adaf84efd --- /dev/null +++ b/pkgs/python/3.4/3.3.6-tkinter-x11.patch @@ -0,0 +1 @@ +../3.3/3.3.6-tkinter-x11.patch \ No newline at end of file diff --git a/pkgs/python/3.4/3.4.5-issue13756.patch b/pkgs/python/3.4/3.4.5-issue13756.patch new file mode 100644 index 000000000..a75fb0eb2 --- /dev/null +++ b/pkgs/python/3.4/3.4.5-issue13756.patch @@ -0,0 +1,44 @@ +diff --git Lib/distutils/command/build_ext.py Lib/distutils/command/build_ext.py +index acbe648..6bedbb2 100644 +--- Lib/distutils/command/build_ext.py ++++ Lib/distutils/command/build_ext.py +@@ -695,10 +695,6 @@ class build_ext(Command): + return ext.libraries + [pythonlib] + else: + 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] +diff --git Makefile.pre.in Makefile.pre.in +index e19fc00..87b6dad 100644 +--- Makefile.pre.in ++++ Makefile.pre.in +@@ -636,9 +636,9 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ + $(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 --git Modules/makesetup Modules/makesetup +index 8b5cc28..abc7eee 100755 +--- Modules/makesetup ++++ 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 + + # Main loop diff --git a/pkgs/python/3.4/3.4.5-struct.patch b/pkgs/python/3.4/3.4.5-struct.patch new file mode 100644 index 000000000..b83b94baf --- /dev/null +++ b/pkgs/python/3.4/3.4.5-struct.patch @@ -0,0 +1,13 @@ +diff --git Modules/_struct.c Modules/_struct.c +index ad9959e..0a5e5ed 100644 +--- Modules/_struct.c ++++ Modules/_struct.c +@@ -1627,7 +1627,7 @@ unpackiter_iternext(unpackiterobject *self) + } + + static PyTypeObject unpackiter_type = { +- PyVarObject_HEAD_INIT(&PyType_Type, 0) ++ PyVarObject_HEAD_INIT(NULL, 0) + "unpack_iterator", /* tp_name */ + sizeof(unpackiterobject), /* tp_basicsize */ + 0, /* tp_itemsize */ diff --git a/pkgs/python/3.5/2.6.5-FD_SETSIZE.patch b/pkgs/python/3.5/2.6.5-FD_SETSIZE.patch new file mode 120000 index 000000000..4c1ac1be6 --- /dev/null +++ b/pkgs/python/3.5/2.6.5-FD_SETSIZE.patch @@ -0,0 +1 @@ +../2.7/2.6.5-FD_SETSIZE.patch \ No newline at end of file diff --git a/pkgs/python/3.5/2.6.5-ncurses-abi6.patch b/pkgs/python/3.5/2.6.5-ncurses-abi6.patch new file mode 120000 index 000000000..88c29fcee --- /dev/null +++ b/pkgs/python/3.5/2.6.5-ncurses-abi6.patch @@ -0,0 +1 @@ +../2.7/2.6.5-ncurses-abi6.patch \ No newline at end of file diff --git a/pkgs/python/3.5/2.7.3-dylib.patch b/pkgs/python/3.5/2.7.3-dylib.patch new file mode 120000 index 000000000..e85449b0c --- /dev/null +++ b/pkgs/python/3.5/2.7.3-dylib.patch @@ -0,0 +1 @@ +../2.7/2.7.3-dylib.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.2.6-ctypes-util-find_library.patch b/pkgs/python/3.5/3.2.6-ctypes-util-find_library.patch new file mode 120000 index 000000000..84d439af5 --- /dev/null +++ b/pkgs/python/3.5/3.2.6-ctypes-util-find_library.patch @@ -0,0 +1 @@ +../3.2/3.2.6-ctypes-util-find_library.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.2.6-export-PySignal_SetWakeupFd.patch b/pkgs/python/3.5/3.2.6-export-PySignal_SetWakeupFd.patch new file mode 120000 index 000000000..33a316868 --- /dev/null +++ b/pkgs/python/3.5/3.2.6-export-PySignal_SetWakeupFd.patch @@ -0,0 +1 @@ +../3.2/3.2.6-export-PySignal_SetWakeupFd.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.2.6-getpath-exe-extension.patch b/pkgs/python/3.5/3.2.6-getpath-exe-extension.patch new file mode 120000 index 000000000..515ccd302 --- /dev/null +++ b/pkgs/python/3.5/3.2.6-getpath-exe-extension.patch @@ -0,0 +1 @@ +../3.2/3.2.6-getpath-exe-extension.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.2.6-no-enable-new-dtags.patch b/pkgs/python/3.5/3.2.6-no-enable-new-dtags.patch new file mode 120000 index 000000000..9268dd9fe --- /dev/null +++ b/pkgs/python/3.5/3.2.6-no-enable-new-dtags.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-enable-new-dtags.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.2.6-no-native-tls.patch b/pkgs/python/3.5/3.2.6-no-native-tls.patch new file mode 120000 index 000000000..26507a8e6 --- /dev/null +++ b/pkgs/python/3.5/3.2.6-no-native-tls.patch @@ -0,0 +1 @@ +../3.2/3.2.6-no-native-tls.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.3.6-dbm.patch b/pkgs/python/3.5/3.3.6-dbm.patch new file mode 120000 index 000000000..aa9cd10ab --- /dev/null +++ b/pkgs/python/3.5/3.3.6-dbm.patch @@ -0,0 +1 @@ +../3.3/3.3.6-dbm.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.3.6-tkinter-x11.patch b/pkgs/python/3.5/3.3.6-tkinter-x11.patch new file mode 120000 index 000000000..adaf84efd --- /dev/null +++ b/pkgs/python/3.5/3.3.6-tkinter-x11.patch @@ -0,0 +1 @@ +../3.3/3.3.6-tkinter-x11.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.4.5-issue13756.patch b/pkgs/python/3.5/3.4.5-issue13756.patch new file mode 120000 index 000000000..dbab9639e --- /dev/null +++ b/pkgs/python/3.5/3.4.5-issue13756.patch @@ -0,0 +1 @@ +../3.4/3.4.5-issue13756.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.4.5-struct.patch b/pkgs/python/3.5/3.4.5-struct.patch new file mode 120000 index 000000000..da3d028d1 --- /dev/null +++ b/pkgs/python/3.5/3.4.5-struct.patch @@ -0,0 +1 @@ +../3.4/3.4.5-struct.patch \ No newline at end of file diff --git a/pkgs/python/3.5/3.5.2-no-libm.patch b/pkgs/python/3.5/3.5.2-no-libm.patch new file mode 100644 index 000000000..1836c7a26 --- /dev/null +++ b/pkgs/python/3.5/3.5.2-no-libm.patch @@ -0,0 +1,15 @@ +diff --git setup.py setup.py +index 34742c7..c0b028c 100644 +--- setup.py ++++ setup.py +@@ -480,8 +480,8 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) + + def detect_math_libs(self): +- # Check for MacOS X, which doesn't need libm.a at all +- if host_platform == 'darwin': ++ # Check for MacOS X or Cygwin, which don't need libm.a at all ++ if host_platform in ['darwin', 'cygwin']: + return [] + else: + return ['m'] diff --git a/pkgs/python/3.5/3.5.2-struct_siginfo_si_band.patch b/pkgs/python/3.5/3.5.2-struct_siginfo_si_band.patch new file mode 100644 index 000000000..fb645568d --- /dev/null +++ b/pkgs/python/3.5/3.5.2-struct_siginfo_si_band.patch @@ -0,0 +1,66 @@ +diff --git Modules/signalmodule.c Modules/signalmodule.c +index 753d987..c69c0ce 100644 +--- Modules/signalmodule.c ++++ Modules/signalmodule.c +@@ -962,7 +962,11 @@ fill_siginfo(siginfo_t *si) + PyStructSequence_SET_ITEM(result, 4, _PyLong_FromUid(si->si_uid)); + PyStructSequence_SET_ITEM(result, 5, + PyLong_FromLong((long)(si->si_status))); ++#ifdef HAVE_SIGINFO_T_SI_BAND + PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(si->si_band)); ++#else ++ PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(0L)); ++#endif + if (PyErr_Occurred()) { + Py_DECREF(result); + return NULL; +diff --git configure configure +index 2fbe259..8281f95 100755 +--- configure ++++ configure +@@ -13057,6 +13057,18 @@ _ACEOF + + fi + ++# Issue #21085: In Cygwin, siginfo_t does not have si_band field. ++ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include ++" ++if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_SIGINFO_T_SI_BAND 1 ++_ACEOF ++ ++ ++fi ++ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 + $as_echo_n "checking for time.h that defines altzone... " >&6; } +diff --git configure.ac configure.ac +index 8ef1760..6bfee80 100644 +--- configure.ac ++++ configure.ac +@@ -3843,6 +3843,8 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) + AC_CHECK_MEMBERS([struct stat.st_gen]) + AC_CHECK_MEMBERS([struct stat.st_birthtime]) + AC_CHECK_MEMBERS([struct stat.st_blocks]) ++# Issue #21085: In Cygwin, siginfo_t does not have si_band field. ++AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[#include ]]) + + AC_MSG_CHECKING(for time.h that defines altzone) + AC_CACHE_VAL(ac_cv_header_time_altzone,[ +diff --git pyconfig.h.in pyconfig.h.in +index 6304a8e..eda0cf9 100644 +--- pyconfig.h.in ++++ pyconfig.h.in +@@ -837,6 +837,9 @@ + /* Define to 1 if you have the `sigaltstack' function. */ + #undef HAVE_SIGALTSTACK + ++/* Define to 1 if `si_band' is a member of `siginfo_t'. */ ++#undef HAVE_SIGINFO_T_SI_BAND ++ + /* Define to 1 if you have the `siginterrupt' function. */ + #undef HAVE_SIGINTERRUPT + diff --git a/pkgs/python/python.yaml b/pkgs/python/python.yaml index a00c32e5d..d69d5fe2e 100644 --- a/pkgs/python/python.yaml +++ b/pkgs/python/python.yaml @@ -36,20 +36,20 @@ build_stages: mode: update extra: ['--with-system-ffi', '--with-system-expat', '--with-dbmliborder=gdbm', '--with-libc=', '--with-libm=' ] - - when: platform == 'Cygwin' + - when: platform == 'Cygwin' and pyver == '2.7' name: cygwin-patch # patches adapted from https://github.com/cygwinports/python before: configure files: - - '2.5.2-ctypes-util-find_library.patch' - - '2.5.2-tkinter-x11.patch' - - '2.6.5-FD_SETSIZE.patch' - - '2.6.5-export-PySignal_SetWakeupFd.patch' - - '2.6.5-ncurses-abi6.patch' - - '2.7.3-dbm.patch' - - '2.7.3-dylib.patch' - - '2.7.3-getpath-exe-extension.patch' - - '2.7.3-no-libm.patch' + - '2.7/2.5.2-ctypes-util-find_library.patch' + - '2.7/2.5.2-tkinter-x11.patch' + - '2.7/2.6.5-FD_SETSIZE.patch' + - '2.7/2.6.5-export-PySignal_SetWakeupFd.patch' + - '2.7/2.6.5-ncurses-abi6.patch' + - '2.7/2.7.3-dbm.patch' + - '2.7/2.7.3-dylib.patch' + - '2.7/2.7.3-getpath-exe-extension.patch' + - '2.7/2.7.3-no-libm.patch' handler: bash bash: | patch -p0 < _hashdist/2.5.2-ctypes-util-find_library.patch @@ -62,6 +62,148 @@ build_stages: patch -p0 < _hashdist/2.7.3-getpath-exe-extension.patch patch -p0 < _hashdist/2.7.3-no-libm.patch + - when: platform == 'Cygwin' and pyver == '3.2' + name: cygwin-patch + # patches adapted from https://github.com/cygwinports/python + before: configure + files: + - '3.2/2.6.5-FD_SETSIZE.patch' + - '3.2/2.6.5-ncurses-abi6.patch' + - '3.2/2.7.3-dylib.patch' + - '3.2/3.2.6-ctypes-util-find_library.patch' + - '3.2/3.2.6-dbm.patch' + - '3.2/3.2.6-export-PyNode_SizeOf.patch' + - '3.2/3.2.6-export-PySignal_SetWakeupFd.patch' + - '3.2/3.2.6-getpath-exe-extension.patch' + - '3.2/3.2.6-issue13756.patch' + - '3.2/3.2.6-no-enable-new-dtags.patch' + - '3.2/3.2.6-no-libm.patch' + - '3.2/3.2.6-no-native-tls.patch' + - '3.2/3.2.6-tkinter-x11.patch' + handler: bash + bash: | + patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/2.7.3-dylib.patch + patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.2.6-dbm.patch + patch -p0 < _hashdist/3.2.6-export-PyNode_SizeOf.patch + patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.2.6-issue13756.patch + patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.2.6-no-libm.patch + patch -p0 < _hashdist/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.2.6-tkinter-x11.patch + + - when: platform == 'Cygwin' and pyver == '3.3' + name: cygwin-patch + # patches adapted from https://github.com/cygwinports/python + before: configure + files: + - '3.3/2.6.5-FD_SETSIZE.patch' + - '3.3/2.6.5-ncurses-abi6.patch' + - '3.3/2.7.3-dylib.patch' + - '3.3/3.2.6-ctypes-util-find_library.patch' + - '3.3/3.2.6-export-PyNode_SizeOf.patch' + - '3.3/3.2.6-export-PySignal_SetWakeupFd.patch' + - '3.3/3.2.6-getpath-exe-extension.patch' + - '3.3/3.2.6-issue13756.patch' + - '3.3/3.2.6-no-enable-new-dtags.patch' + - '3.3/3.2.6-no-native-tls.patch' + - '3.3/3.3.6-dbm.patch' + - '3.3/3.3.6-no-libm.patch' + - '3.3/3.3.6-struct_siginfo_si_band.patch' + - '3.3/3.3.6-tkinter-x11.patch' + handler: bash + bash: | + patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/2.7.3-dylib.patch + patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.2.6-export-PyNode_SizeOf.patch + patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.2.6-issue13756.patch + patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.3.6-dbm.patch + patch -p0 < _hashdist/3.3.6-no-libm.patch + patch -p0 < _hashdist/3.3.6-struct_siginfo_si_band.patch + patch -p0 < _hashdist/3.3.6-tkinter-x11.patch + + - when: platform == 'Cygwin' and pyver == '3.4' + name: cygwin-patch + # patches adapted from https://github.com/cygwinports/python + before: configure + files: + - '3.4/2.6.5-FD_SETSIZE.patch' + - '3.4/2.6.5-ncurses-abi6.patch' + - '3.4/2.7.3-dylib.patch' + - '3.4/3.2.6-ctypes-util-find_library.patch' + - '3.4/3.2.6-export-PySignal_SetWakeupFd.patch' + - '3.4/3.2.6-getpath-exe-extension.patch' + - '3.4/3.2.6-no-enable-new-dtags.patch' + - '3.4/3.2.6-no-native-tls.patch' + - '3.4/3.3.6-dbm.patch' + - '3.4/3.3.6-no-libm.patch' + - '3.4/3.3.6-struct_siginfo_si_band.patch' + - '3.4/3.3.6-tkinter-x11.patch' + - '3.4/3.4.5-issue13756.patch' + - '3.4/3.4.5-struct.patch' + handler: bash + bash: | + patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/2.7.3-dylib.patch + patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.3.6-dbm.patch + patch -p0 < _hashdist/3.3.6-no-libm.patch + patch -p0 < _hashdist/3.3.6-struct_siginfo_si_band.patch + patch -p0 < _hashdist/3.3.6-tkinter-x11.patch + patch -p0 < _hashdist/3.4.5-issue13756.patch + patch -p0 < _hashdist/3.4.5-struct.patch + + - when: platform == 'Cygwin' and pyver == '3.5' + name: cygwin-patch + # patches adapted from https://github.com/cygwinports/python + before: configure + files: + - '3.5/2.6.5-FD_SETSIZE.patch' + - '3.5/2.6.5-ncurses-abi6.patch' + - '3.5/2.7.3-dylib.patch' + - '3.5/3.2.6-ctypes-util-find_library.patch' + - '3.5/3.2.6-export-PySignal_SetWakeupFd.patch' + - '3.5/3.2.6-getpath-exe-extension.patch' + - '3.5/3.2.6-no-enable-new-dtags.patch' + - '3.5/3.2.6-no-native-tls.patch' + - '3.5/3.3.6-dbm.patch' + - '3.5/3.3.6-tkinter-x11.patch' + - '3.5/3.4.5-issue13756.patch' + - '3.5/3.4.5-struct.patch' + - '3.5/3.5.2-no-libm.patch' + - '3.5/3.5.2-struct_siginfo_si_band.patch' + handler: bash + bash: | + patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/2.7.3-dylib.patch + patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.3.6-dbm.patch + patch -p0 < _hashdist/3.3.6-tkinter-x11.patch + patch -p0 < _hashdist/3.4.5-issue13756.patch + patch -p0 < _hashdist/3.4.5-struct.patch + patch -p0 < _hashdist/3.5.2-no-libm.patch + patch -p0 < _hashdist/3.5.2-struct_siginfo_si_band.patch + - when: link == 'shared' name: configure mode: update From c29ae0ce5ac8ab155c3b3597b4ad752862cbb371 Mon Sep 17 00:00:00 2001 From: "Erik M. Bray" Date: Mon, 5 Dec 2016 15:14:31 +0100 Subject: [PATCH 2/2] Fix paths to patch files in the _hashdist directory --- pkgs/python/python.yaml | 128 ++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/pkgs/python/python.yaml b/pkgs/python/python.yaml index d69d5fe2e..156f0a332 100644 --- a/pkgs/python/python.yaml +++ b/pkgs/python/python.yaml @@ -52,15 +52,15 @@ build_stages: - '2.7/2.7.3-no-libm.patch' handler: bash bash: | - patch -p0 < _hashdist/2.5.2-ctypes-util-find_library.patch - patch -p0 < _hashdist/2.5.2-tkinter-x11.patch - patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch - patch -p0 < _hashdist/2.6.5-export-PySignal_SetWakeupFd.patch - patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch - patch -p0 < _hashdist/2.7.3-dbm.patch - patch -p0 < _hashdist/2.7.3-dylib.patch - patch -p0 < _hashdist/2.7.3-getpath-exe-extension.patch - patch -p0 < _hashdist/2.7.3-no-libm.patch + patch -p0 < _hashdist/2.7/2.5.2-ctypes-util-find_library.patch + patch -p0 < _hashdist/2.7/2.5.2-tkinter-x11.patch + patch -p0 < _hashdist/2.7/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/2.7/2.6.5-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/2.7/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/2.7/2.7.3-dbm.patch + patch -p0 < _hashdist/2.7/2.7.3-dylib.patch + patch -p0 < _hashdist/2.7/2.7.3-getpath-exe-extension.patch + patch -p0 < _hashdist/2.7/2.7.3-no-libm.patch - when: platform == 'Cygwin' and pyver == '3.2' name: cygwin-patch @@ -82,19 +82,19 @@ build_stages: - '3.2/3.2.6-tkinter-x11.patch' handler: bash bash: | - patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch - patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch - patch -p0 < _hashdist/2.7.3-dylib.patch - patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch - patch -p0 < _hashdist/3.2.6-dbm.patch - patch -p0 < _hashdist/3.2.6-export-PyNode_SizeOf.patch - patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch - patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch - patch -p0 < _hashdist/3.2.6-issue13756.patch - patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch - patch -p0 < _hashdist/3.2.6-no-libm.patch - patch -p0 < _hashdist/3.2.6-no-native-tls.patch - patch -p0 < _hashdist/3.2.6-tkinter-x11.patch + patch -p0 < _hashdist/3.2/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/3.2/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/3.2/2.7.3-dylib.patch + patch -p0 < _hashdist/3.2/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.2/3.2.6-dbm.patch + patch -p0 < _hashdist/3.2/3.2.6-export-PyNode_SizeOf.patch + patch -p0 < _hashdist/3.2/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.2/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.2/3.2.6-issue13756.patch + patch -p0 < _hashdist/3.2/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.2/3.2.6-no-libm.patch + patch -p0 < _hashdist/3.2/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.2/3.2.6-tkinter-x11.patch - when: platform == 'Cygwin' and pyver == '3.3' name: cygwin-patch @@ -117,20 +117,20 @@ build_stages: - '3.3/3.3.6-tkinter-x11.patch' handler: bash bash: | - patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch - patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch - patch -p0 < _hashdist/2.7.3-dylib.patch - patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch - patch -p0 < _hashdist/3.2.6-export-PyNode_SizeOf.patch - patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch - patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch - patch -p0 < _hashdist/3.2.6-issue13756.patch - patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch - patch -p0 < _hashdist/3.2.6-no-native-tls.patch - patch -p0 < _hashdist/3.3.6-dbm.patch - patch -p0 < _hashdist/3.3.6-no-libm.patch - patch -p0 < _hashdist/3.3.6-struct_siginfo_si_band.patch - patch -p0 < _hashdist/3.3.6-tkinter-x11.patch + patch -p0 < _hashdist/3.3/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/3.3/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/3.3/2.7.3-dylib.patch + patch -p0 < _hashdist/3.3/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.3/3.2.6-export-PyNode_SizeOf.patch + patch -p0 < _hashdist/3.3/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.3/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.3/3.2.6-issue13756.patch + patch -p0 < _hashdist/3.3/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.3/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.3/3.3.6-dbm.patch + patch -p0 < _hashdist/3.3/3.3.6-no-libm.patch + patch -p0 < _hashdist/3.3/3.3.6-struct_siginfo_si_band.patch + patch -p0 < _hashdist/3.3/3.3.6-tkinter-x11.patch - when: platform == 'Cygwin' and pyver == '3.4' name: cygwin-patch @@ -153,20 +153,20 @@ build_stages: - '3.4/3.4.5-struct.patch' handler: bash bash: | - patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch - patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch - patch -p0 < _hashdist/2.7.3-dylib.patch - patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch - patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch - patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch - patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch - patch -p0 < _hashdist/3.2.6-no-native-tls.patch - patch -p0 < _hashdist/3.3.6-dbm.patch - patch -p0 < _hashdist/3.3.6-no-libm.patch - patch -p0 < _hashdist/3.3.6-struct_siginfo_si_band.patch - patch -p0 < _hashdist/3.3.6-tkinter-x11.patch - patch -p0 < _hashdist/3.4.5-issue13756.patch - patch -p0 < _hashdist/3.4.5-struct.patch + patch -p0 < _hashdist/3.4/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/3.4/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/3.4/2.7.3-dylib.patch + patch -p0 < _hashdist/3.4/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.4/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.4/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.4/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.4/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.4/3.3.6-dbm.patch + patch -p0 < _hashdist/3.4/3.3.6-no-libm.patch + patch -p0 < _hashdist/3.4/3.3.6-struct_siginfo_si_band.patch + patch -p0 < _hashdist/3.4/3.3.6-tkinter-x11.patch + patch -p0 < _hashdist/3.4/3.4.5-issue13756.patch + patch -p0 < _hashdist/3.4/3.4.5-struct.patch - when: platform == 'Cygwin' and pyver == '3.5' name: cygwin-patch @@ -189,20 +189,20 @@ build_stages: - '3.5/3.5.2-struct_siginfo_si_band.patch' handler: bash bash: | - patch -p0 < _hashdist/2.6.5-FD_SETSIZE.patch - patch -p0 < _hashdist/2.6.5-ncurses-abi6.patch - patch -p0 < _hashdist/2.7.3-dylib.patch - patch -p0 < _hashdist/3.2.6-ctypes-util-find_library.patch - patch -p0 < _hashdist/3.2.6-export-PySignal_SetWakeupFd.patch - patch -p0 < _hashdist/3.2.6-getpath-exe-extension.patch - patch -p0 < _hashdist/3.2.6-no-enable-new-dtags.patch - patch -p0 < _hashdist/3.2.6-no-native-tls.patch - patch -p0 < _hashdist/3.3.6-dbm.patch - patch -p0 < _hashdist/3.3.6-tkinter-x11.patch - patch -p0 < _hashdist/3.4.5-issue13756.patch - patch -p0 < _hashdist/3.4.5-struct.patch - patch -p0 < _hashdist/3.5.2-no-libm.patch - patch -p0 < _hashdist/3.5.2-struct_siginfo_si_band.patch + patch -p0 < _hashdist/3.5/2.6.5-FD_SETSIZE.patch + patch -p0 < _hashdist/3.5/2.6.5-ncurses-abi6.patch + patch -p0 < _hashdist/3.5/2.7.3-dylib.patch + patch -p0 < _hashdist/3.5/3.2.6-ctypes-util-find_library.patch + patch -p0 < _hashdist/3.5/3.2.6-export-PySignal_SetWakeupFd.patch + patch -p0 < _hashdist/3.5/3.2.6-getpath-exe-extension.patch + patch -p0 < _hashdist/3.5/3.2.6-no-enable-new-dtags.patch + patch -p0 < _hashdist/3.5/3.2.6-no-native-tls.patch + patch -p0 < _hashdist/3.5/3.3.6-dbm.patch + patch -p0 < _hashdist/3.5/3.3.6-tkinter-x11.patch + patch -p0 < _hashdist/3.5/3.4.5-issue13756.patch + patch -p0 < _hashdist/3.5/3.4.5-struct.patch + patch -p0 < _hashdist/3.5/3.5.2-no-libm.patch + patch -p0 < _hashdist/3.5/3.5.2-struct_siginfo_si_band.patch - when: link == 'shared' name: configure