From 10762b9bed08e54b9ea1233d87150767cb09c391 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 25 Aug 2024 19:09:30 -0500 Subject: [PATCH] manylinux2014 for linux x86 --- README.md | 2 +- down_them_all.sh | 12 ++++++------ recipe/build.sh | 6 +----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index fdc9f0c..87e6b47 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ need to do ALL of the following for Linux, For macOS we need to ONE of the following, - 1. Use only static libraries for C++ dependencies and ink in libc++ statically OR + 1. Use only static libraries for C++ dependencies and ink in libc++ statically OR 2. Hope that the dependencies don't use newer features of libc++. (We checked and they didn't) For Windows, diff --git a/down_them_all.sh b/down_them_all.sh index 4612711..3d4a15d 100644 --- a/down_them_all.sh +++ b/down_them_all.sh @@ -22,11 +22,11 @@ declare -a arr=( "-cp310-cp310-macosx_11_0_arm64.whl" "-cp311-cp311-macosx_11_0_arm64.whl" "-cp312-cp312-macosx_11_0_arm64.whl" - "-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" - "-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" - "-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" - "-cp311-cp311-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" - "-cp312-cp312-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" + "-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" @@ -43,7 +43,7 @@ declare -a arr=( "-cp311-cp311-win_amd64.whl" "-cp312-cp312-win_amd64.whl" "-pp39-pypy39_pp73-macosx_10_9_x86_64.whl" - "-pp39-pypy39_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl" + "-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" ".tar.gz") diff --git a/recipe/build.sh b/recipe/build.sh index f9b6fa4..807abd2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -68,11 +68,7 @@ popd # Repair the wheel pushd python - if [[ "$target_platform" == linux-64 ]]; then - rm -rf $PREFIX/lib/libstdc++.* - rm -rf $PREFIX/lib/libgcc* - auditwheel repair dist/*.whl -w $PWD/fixed_wheels --plat manylinux2010_x86_64 - elif [[ "$target_platform" == linux-* ]]; then + if [[ "$target_platform" == linux-* ]]; then rm -rf $PREFIX/lib/libstdc++.* rm -rf $PREFIX/lib/libgcc* auditwheel repair dist/*.whl -w $PWD/fixed_wheels --plat manylinux2014_$ARCH