mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
dev-lang/python: Remove 3.5*
Python 3.5 is no longer supported. A clean ebuild for the interpreter now resides in ::python. Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1332,17 +1332,7 @@ class PyBuildExt(build_ext):
|
||||
# Jeremy Hylton's rlimit interface
|
||||
exts.append( Extension('resource', ['resource.c']) )
|
||||
|
||||
- # Sun yellow pages. Some systems have the functions in libc.
|
||||
- if (host_platform not in ['cygwin', 'qnx6'] and
|
||||
- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
|
||||
- if (self.compiler.find_library_file(lib_dirs, 'nsl')):
|
||||
- libs = ['nsl']
|
||||
- else:
|
||||
- libs = []
|
||||
- exts.append( Extension('nis', ['nismodule.c'],
|
||||
- libraries = libs) )
|
||||
- else:
|
||||
- missing.append('nis')
|
||||
+ missing.append('nis')
|
||||
else:
|
||||
missing.extend(['nis', 'resource', 'termios'])
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
do not hardcode /usr/include paths
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4402,7 +4402,7 @@ fi
|
||||
|
||||
# first curses header check
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
|
||||
|
||||
AC_CHECK_HEADERS(curses.h ncurses.h)
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sun, 5 Jun 2016 08:18:01 +0200
|
||||
Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
|
||||
|
||||
Bug: http://bugs.python.org/issue27226
|
||||
Bug: https://bugs.gentoo.org/585060
|
||||
---
|
||||
Lib/distutils/command/build_py.py | 8 ++++----
|
||||
Lib/distutils/command/install_lib.py | 12 ++++++------
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
|
||||
index cf0ca57..838d4e4 100644
|
||||
--- a/Lib/distutils/command/build_py.py
|
||||
+++ b/Lib/distutils/command/build_py.py
|
||||
@@ -315,9 +315,9 @@ class build_py (Command):
|
||||
if self.compile:
|
||||
outputs.append(importlib.util.cache_from_source(
|
||||
filename, optimization=''))
|
||||
- if self.optimize > 0:
|
||||
+ for opt in range(1, self.optimize + 1):
|
||||
outputs.append(importlib.util.cache_from_source(
|
||||
- filename, optimization=self.optimize))
|
||||
+ filename, optimization=opt))
|
||||
|
||||
outputs += [
|
||||
os.path.join(build_dir, filename)
|
||||
@@ -387,8 +387,8 @@ class build_py (Command):
|
||||
if self.compile:
|
||||
byte_compile(files, optimize=0,
|
||||
force=self.force, prefix=prefix, dry_run=self.dry_run)
|
||||
- if self.optimize > 0:
|
||||
- byte_compile(files, optimize=self.optimize,
|
||||
+ for opt in range(1, self.optimize + 1):
|
||||
+ byte_compile(files, optimize=opt,
|
||||
force=self.force, prefix=prefix, dry_run=self.dry_run)
|
||||
|
||||
class build_py_2to3(build_py, Mixin2to3):
|
||||
diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py
|
||||
index 6154cf0..049b662 100644
|
||||
--- a/Lib/distutils/command/install_lib.py
|
||||
+++ b/Lib/distutils/command/install_lib.py
|
||||
@@ -24,8 +24,8 @@ class install_lib(Command):
|
||||
# 2) compile .pyc only (--compile --no-optimize; default)
|
||||
# 3) compile .pyc and "opt-1" .pyc (--compile --optimize)
|
||||
# 4) compile "opt-1" .pyc only (--no-compile --optimize)
|
||||
- # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
|
||||
- # 6) compile "opt-2" .pyc only (--no-compile --optimize-more)
|
||||
+ # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
|
||||
+ # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
|
||||
#
|
||||
# The UI for this is two options, 'compile' and 'optimize'.
|
||||
# 'compile' is strictly boolean, and only decides whether to
|
||||
@@ -132,8 +132,8 @@ class install_lib(Command):
|
||||
byte_compile(files, optimize=0,
|
||||
force=self.force, prefix=install_root,
|
||||
dry_run=self.dry_run)
|
||||
- if self.optimize > 0:
|
||||
- byte_compile(files, optimize=self.optimize,
|
||||
+ for opt in range(1, self.optimize + 1):
|
||||
+ byte_compile(files, optimize=opt,
|
||||
force=self.force, prefix=install_root,
|
||||
verbose=self.verbose, dry_run=self.dry_run)
|
||||
|
||||
@@ -167,9 +167,9 @@ class install_lib(Command):
|
||||
if self.compile:
|
||||
bytecode_files.append(importlib.util.cache_from_source(
|
||||
py_file, optimization=''))
|
||||
- if self.optimize > 0:
|
||||
+ for opt in range(1, self.optimize + 1):
|
||||
bytecode_files.append(importlib.util.cache_from_source(
|
||||
- py_file, optimization=self.optimize))
|
||||
+ py_file, optimization=opt))
|
||||
|
||||
return bytecode_files
|
||||
|
||||
--
|
||||
2.8.3
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
The hash implementation casts the input pointer to uint64_t* and directly reads
|
||||
from this, which may cause unaligned accesses. Use memcpy() instead so this code
|
||||
will not crash with SIGBUS on sparc.
|
||||
|
||||
--- a/Python/pyhash.c 2017-11-29 10:21:20.283094068 +0100
|
||||
+++ b/Python/pyhash.c 2017-11-29 10:24:26.733087813 +0100
|
||||
@@ -372,7 +372,7 @@ siphash24(const void *src, Py_ssize_t sr
|
||||
PY_UINT64_T k0 = _le64toh(_Py_HashSecret.siphash.k0);
|
||||
PY_UINT64_T k1 = _le64toh(_Py_HashSecret.siphash.k1);
|
||||
PY_UINT64_T b = (PY_UINT64_T)src_sz << 56;
|
||||
- const PY_UINT64_T *in = (PY_UINT64_T*)src;
|
||||
+ const PY_UINT8_T *in = (PY_UINT8_T*)src;
|
||||
|
||||
PY_UINT64_T v0 = k0 ^ 0x736f6d6570736575ULL;
|
||||
PY_UINT64_T v1 = k1 ^ 0x646f72616e646f6dULL;
|
||||
@@ -381,12 +381,14 @@ siphash24(const void *src, Py_ssize_t sr
|
||||
|
||||
PY_UINT64_T t;
|
||||
PY_UINT8_T *pt;
|
||||
- PY_UINT8_T *m;
|
||||
+ const PY_UINT8_T *m;
|
||||
|
||||
while (src_sz >= 8) {
|
||||
- PY_UINT64_T mi = _le64toh(*in);
|
||||
- in += 1;
|
||||
- src_sz -= 8;
|
||||
+ PY_UINT64_T mi;
|
||||
+ memcpy(&mi, in, sizeof(mi));
|
||||
+ mi = _le64toh(mi);
|
||||
+ in += sizeof(mi);
|
||||
+ src_sz -= sizeof(mi);
|
||||
v3 ^= mi;
|
||||
DOUBLE_ROUND(v0,v1,v2,v3);
|
||||
v0 ^= mi;
|
||||
@@ -394,7 +396,7 @@ siphash24(const void *src, Py_ssize_t sr
|
||||
|
||||
t = 0;
|
||||
pt = (PY_UINT8_T *)&t;
|
||||
- m = (PY_UINT8_T *)in;
|
||||
+ m = in;
|
||||
switch (src_sz) {
|
||||
case 7: pt[6] = m[6];
|
||||
case 6: pt[5] = m[5];
|
||||
Reference in New Issue
Block a user