diff options
author | Ivan Babrou <github@ivan.computer> | 2021-02-26 21:03:53 -0800 |
---|---|---|
committer | Ivan Babrou <github@ivan.computer> | 2021-03-03 16:02:07 -0800 |
commit | b00c7c2d1d905eb63c81a0917f1a94b763a7843b (patch) | |
tree | 23077e05bb2c43fec8be19fc552e34bac8d8a42e /pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch | |
parent | 8b8480483710b2be5161a0d6329499342ab51c82 (diff) | |
download | nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar.gz nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar.bz2 nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar.lz nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar.xz nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.tar.zst nixpkgs-b00c7c2d1d905eb63c81a0917f1a94b763a7843b.zip |
python37, python2: remove win64 workaround to fix aarch64-darwin
The issue manifests itself as the following on `aarch64-darwin`: ``` >>> import ctypes Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 551, in <module> _reset_cache() File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 273, in _reset_cache CFUNCTYPE(c_int)(lambda: None) MemoryError ``` The commit we backport is included in Python 3.8, and it reverts the change that was introduced all the way back in Python 2.7.
Diffstat (limited to 'pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch new file mode 100644 index 00000000000..685b1e83944 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch @@ -0,0 +1,37 @@ +From e6b247c8e524dbe5fc03b3492f628d0d5348bc49 Mon Sep 17 00:00:00 2001 +From: Victor Stinner <vstinner@redhat.com> +Date: Tue, 18 Dec 2018 14:47:21 +0100 +Subject: [PATCH] bpo-35523: Remove ctypes callback workaround (GH-11211) + +Remove ctypes callback workaround: no longer create a callback at startup. +Avoid SELinux alert on "import ctypes" and "import uuid". +--- + Lib/ctypes/__init__.py | 5 ----- + .../next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst | 2 ++ + 2 files changed, 2 insertions(+), 5 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst + +diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py +index 6146773988648..5f78beda5866e 100644 +--- a/Lib/ctypes/__init__.py ++++ b/Lib/ctypes/__init__.py +@@ -266,11 +266,6 @@ def _reset_cache(): + # _SimpleCData.c_char_p_from_param + POINTER(c_char).from_param = c_char_p.from_param + _pointer_type_cache[None] = c_void_p +- # XXX for whatever reasons, creating the first instance of a callback +- # function is needed for the unittests on Win64 to succeed. This MAY +- # be a compiler bug, since the problem occurs only when _ctypes is +- # compiled with the MS SDK compiler. Or an uninitialized variable? +- CFUNCTYPE(c_int)(lambda: None) + + def create_unicode_buffer(init, size=None): + """create_unicode_buffer(aString) -> character array +diff --git a/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst +new file mode 100644 +index 0000000000000..94a9fd257383e +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst +@@ -0,0 +1,2 @@ ++Remove :mod:`ctypes` callback workaround: no longer create a callback at ++startup. Avoid SELinux alert on ``import ctypes`` and ``import uuid``. |