python3: update to 3.6.3
This commit is contained in:
parent
91ce4f7e54
commit
4dcbcf05e6
2 changed files with 3 additions and 66 deletions
|
@ -1,62 +0,0 @@
|
|||
From 3cc711822edfabd05f5d06201eca922df8c132cc Mon Sep 17 00:00:00 2001
|
||||
From: xdegaye <xdegaye@gmail.com>
|
||||
Date: Mon, 22 May 2017 11:15:08 +0200
|
||||
Subject: [PATCH] bpo-29619: Do not use HAVE_LARGEFILE_SUPPORT for type
|
||||
conversions (GH-1666)
|
||||
|
||||
Use only the LongLong form for the conversions
|
||||
|
||||
(cherry picked from commit 50e86033de85294d87b7e942701d456342abde8e)
|
||||
---
|
||||
Modules/posixmodule.c | 23 +++++------------------
|
||||
1 file changed, 5 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git Modules/posixmodule.c.orig Modules/posixmodule.c
|
||||
index 97b57198cd4..111e4c9fde5 100644
|
||||
--- Modules/posixmodule.c.orig
|
||||
+++ Modules/posixmodule.c
|
||||
@@ -1934,14 +1934,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
|
||||
return NULL;
|
||||
|
||||
PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long)st->st_mode));
|
||||
-#if defined(HAVE_LARGEFILE_SUPPORT) || defined(MS_WINDOWS)
|
||||
Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(st->st_ino));
|
||||
- PyStructSequence_SET_ITEM(v, 1,
|
||||
- PyLong_FromUnsignedLongLong(st->st_ino));
|
||||
-#else
|
||||
- Py_BUILD_ASSERT(sizeof(unsigned long) >= sizeof(st->st_ino));
|
||||
- PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLong(st->st_ino));
|
||||
-#endif
|
||||
+ PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLongLong(st->st_ino));
|
||||
#ifdef MS_WINDOWS
|
||||
PyStructSequence_SET_ITEM(v, 2, PyLong_FromUnsignedLong(st->st_dev));
|
||||
#else
|
||||
@@ -1955,12 +1949,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
|
||||
PyStructSequence_SET_ITEM(v, 4, _PyLong_FromUid(st->st_uid));
|
||||
PyStructSequence_SET_ITEM(v, 5, _PyLong_FromGid(st->st_gid));
|
||||
#endif
|
||||
-#ifdef HAVE_LARGEFILE_SUPPORT
|
||||
- PyStructSequence_SET_ITEM(v, 6,
|
||||
- PyLong_FromLongLong((long long)st->st_size));
|
||||
-#else
|
||||
- PyStructSequence_SET_ITEM(v, 6, PyLong_FromLong(st->st_size));
|
||||
-#endif
|
||||
+ Py_BUILD_ASSERT(sizeof(long long) >= sizeof(st->st_size));
|
||||
+ PyStructSequence_SET_ITEM(v, 6, PyLong_FromLongLong(st->st_size));
|
||||
|
||||
#if defined(HAVE_STAT_TV_NSEC)
|
||||
ansec = st->st_atim.tv_nsec;
|
||||
@@ -11484,11 +11474,8 @@ DirEntry_inode(DirEntry *self)
|
||||
Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->win32_file_index));
|
||||
return PyLong_FromUnsignedLongLong(self->win32_file_index);
|
||||
#else /* POSIX */
|
||||
-#ifdef HAVE_LARGEFILE_SUPPORT
|
||||
- return PyLong_FromLongLong((long long)self->d_ino);
|
||||
-#else
|
||||
- return PyLong_FromLong((long)self->d_ino);
|
||||
-#endif
|
||||
+ Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->d_ino));
|
||||
+ return PyLong_FromUnsignedLongLong(self->d_ino);
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'python3'
|
||||
pkgname=python3
|
||||
version=3.6.2
|
||||
revision=2
|
||||
version=3.6.3
|
||||
revision=1
|
||||
wrksrc="Python-${version}"
|
||||
short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="https://www.python.org"
|
||||
license="PSF"
|
||||
distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
|
||||
checksum=9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9
|
||||
checksum=cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da
|
||||
|
||||
replaces="python3.4>=0 python3.5>=0"
|
||||
pycompile_dirs="usr/lib/python${version%.*}"
|
||||
|
@ -58,7 +58,6 @@ do_install() {
|
|||
vlicense LICENSE
|
||||
|
||||
rm -f ${DESTDIR}/usr/bin/2to3
|
||||
|
||||
# Remove test module and tests that fail to be byte-compiled.
|
||||
rm -rf ${DESTDIR}/usr/lib/python${version%.*}/test
|
||||
rm -rf ${DESTDIR}/usr/lib/python${version%.*}/lib2to3/tests
|
||||
|
|
Loading…
Reference in a new issue