From bd37e8776f4803734d5cf16cbb65903288165147 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 13 Jan 2022 10:56:12 +0100 Subject: [PATCH] makepanda: Fix platform tag on aarch64 manylinux Wheels ended up being tagged as i686. --- makepanda/makepanda.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 94215cba14..71aa749a23 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -480,6 +480,8 @@ elif target == 'linux' and (os.path.isfile("/lib/libc-2.5.so") or os.path.isfile # This is manylinux1. A bit of a sloppy check, though. if GetTargetArch() in ('x86_64', 'amd64'): PLATFORM = 'manylinux1-x86_64' + elif GetTargetArch() in ('arm64', 'aarch64'): + PLATFORM = 'manylinux1-aarch64' else: PLATFORM = 'manylinux1-i686' @@ -487,6 +489,8 @@ elif target == 'linux' and (os.path.isfile("/lib/libc-2.12.so") or os.path.isfil # Same sloppy check for manylinux2010. if GetTargetArch() in ('x86_64', 'amd64'): PLATFORM = 'manylinux2010-x86_64' + elif GetTargetArch() in ('arm64', 'aarch64'): + PLATFORM = 'manylinux2010-aarch64' else: PLATFORM = 'manylinux2010-i686' @@ -494,6 +498,8 @@ elif target == 'linux' and (os.path.isfile("/lib/libc-2.17.so") or os.path.isfil # Same sloppy check for manylinux2014. if GetTargetArch() in ('x86_64', 'amd64'): PLATFORM = 'manylinux2014-x86_64' + elif GetTargetArch() in ('arm64', 'aarch64'): + PLATFORM = 'manylinux2014-aarch64' else: PLATFORM = 'manylinux2014-i686' @@ -501,6 +507,8 @@ elif target == 'linux' and (os.path.isfile("/lib/i386-linux-gnu/libc-2.24.so") o # Same sloppy check for manylinux_2_24. if GetTargetArch() in ('x86_64', 'amd64'): PLATFORM = 'manylinux_2_24-x86_64' + elif GetTargetArch() in ('arm64', 'aarch64'): + PLATFORM = 'manylinux_2_24-aarch64' else: PLATFORM = 'manylinux_2_24-i686'