From 01da4fb36e9b38a3e36381eb67389812cbd9cbc8 Mon Sep 17 00:00:00 2001 From: Elana Hashman Date: Sat, 12 May 2018 00:31:25 -0400 Subject: [PATCH 1/2] Detect x32 userspace ABI on 64-bit kernel (fixes #4962) --- src/pip/_internal/pep425tags.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pip/_internal/pep425tags.py b/src/pip/_internal/pep425tags.py index 0b5c7832d4f..1bb5aabdbd4 100644 --- a/src/pip/_internal/pep425tags.py +++ b/src/pip/_internal/pep425tags.py @@ -135,7 +135,12 @@ def get_platform(): if result == "linux_x86_64" and _is_running_32bit(): # 32 bit Python program (running on a 64 bit Linux): pip should only # install and run 32 bit compiled extensions in that case. - result = "linux_i686" + machine = platform.machine() + + if machine == "x86_64": + result = "linux_x32" + else: + result = "linux_i686" # and machine == "i686" return result From 35da227ef5fecc8677959194f0dffd165b53ea82 Mon Sep 17 00:00:00 2001 From: Elana Hashman Date: Sat, 12 May 2018 00:45:57 -0400 Subject: [PATCH 2/2] Add requested news/ file --- news/4962.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/4962.bugfix diff --git a/news/4962.bugfix b/news/4962.bugfix new file mode 100644 index 00000000000..c3e9a494cd4 --- /dev/null +++ b/news/4962.bugfix @@ -0,0 +1 @@ +Detect x32 userspace ABI on 64-bit kernel