diff --git a/base/musl/pkg/python/python-fix-posix-close-clash.patch b/base/musl/pkg/python/python-fix-posix-close-clash.patch deleted file mode 100644 index 6656a3fc3..000000000 --- a/base/musl/pkg/python/python-fix-posix-close-clash.patch +++ /dev/null @@ -1,45 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musl/pkg/python/python-fix-posix-close-clash.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - --------------------------------------------------------------------------------- -./Modules/posixmodule.c:6585:1: error: conflicting types for 'posix_close' -In file included from Include/Python.h:44:0, - from ./Modules/posixmodule.c:28: -/usr/include/unistd.h:38:5: note: previous declaration of 'posix_close' was here --------------------------------------------------------------------------------- - -The patch originally comes from https://github.com/sabotage-linux/sabotage/ - ---- a/Modules/posixmodule.c 2014-03-20 17:50:48.774208443 +0100 -+++ b/Modules/posixmodule.c 2014-03-20 17:52:38.080729474 +0100 -@@ -6582,7 +6582,7 @@ - Close a file descriptor (for low level IO)."); - - static PyObject * --posix_close(PyObject *self, PyObject *args) -+posix_closex(PyObject *self, PyObject *args) - { - int fd, res; - if (!PyArg_ParseTuple(args, "i:close", &fd)) -@@ -8960,7 +8960,7 @@ - {"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__}, - #endif /* HAVE_TCSETPGRP */ - {"open", posix_open, METH_VARARGS, posix_open__doc__}, -- {"close", posix_close, METH_VARARGS, posix_close__doc__}, -+ {"close", posix_closex, METH_VARARGS, posix_close__doc__}, - {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, - {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, - {"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__}, diff --git a/python/python/python.conf b/python/python/python.conf index bef78100b..ac025e4f0 100644 --- a/python/python/python.conf +++ b/python/python/python.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../python/python.conf -# Copyright (C) 2007 - 2014 The OpenSDE Project +# Copyright (C) 2007 - 2015 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -29,7 +29,7 @@ python_preconf() for x in gdbm readline zlib; do # enable if present - if pkginstalled $x; then + if pkginstalled -f $x; then sed -i -e "s/^#\($x\)/\1/" Modules/Setup.dist fi done @@ -55,6 +55,9 @@ fix_python_for_64bit() { # toolchain tweaks if atstage toolchain; then # we need pgen at cross stage that runs on the build host + # but as our toolchain stage is small we only build what we need. + makeopt="python Parser/pgen" + makeinstopt= hook_add postmake 5 'cp Parser/pgen $root$bindir/python-pgen' fi @@ -75,3 +78,4 @@ if atstage cross; then var_append configprefix ' ' "CFLAGS=\"$CFLAGS\"" var_append configprefix ' ' "LDFLAGS=\"$LDFLAGS\"" fi + diff --git a/python/python/python.desc b/python/python/python.desc index b5ad0b14e..5f3ddfb36 100644 --- a/python/python/python.desc +++ b/python/python/python.desc @@ -28,7 +28,7 @@ [L] OpenSource [S] Stable -[V] 2.7.9 +[V] 2.7.10 [P] X ??---5---9 109.000 -[D] 2360362437 Python-2.7.9.tgz http://www.python.org/ftp/python/2.7.9/ +[D] 1508317814 Python-2.7.10.tgz http://www.python.org/ftp/python/2.7.10/