Skip to content

feat: use gcc-15 when possible #1873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: use gcc-15 when possible #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ for repeatable builds.
manylinux_2_39 (AlmaLinux/RockyLinux 10 based) - ALPHA
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Toolchain: GCC 14
Toolchain: GCC 15

- aarch64 image: ``quay.io/pypa/manylinux_2_39_aarch64``
- riscv64 image: ``quay.io/pypa/manylinux_2_39_riscv64``
Expand Down Expand Up @@ -157,7 +157,7 @@ grafted into a wheel, will fail to run on older hardware. There's no PEP to hand
yet when it comes to packaging or installing wheels. Auditwheel doesn't detect this either.
See https://github.com/pypa/manylinux/issues/1725

Toolchain: GCC 14
Toolchain: GCC 15

- x86_64 image: ``quay.io/pypa/manylinux_2_34_x86_64``
- i686 image: ``quay.io/pypa/manylinux_2_34_i686``
Expand Down Expand Up @@ -207,7 +207,7 @@ distros using glibc 2.31 or later, including:
manylinux_2_28 (AlmaLinux 8 based)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Toolchain: GCC 14
Toolchain: GCC 15

- x86_64 image: ``quay.io/pypa/manylinux_2_28_x86_64``
- i686 image: ``quay.io/pypa/manylinux_2_28_i686``
Expand Down Expand Up @@ -284,10 +284,10 @@ Toolchain: GCC 4.8
- i686 image: ``quay.io/pypa/manylinux1_i686``


musllinux_1_2 (Alpine Linux 3.22 based, 3.13+ compatible)
musllinux_1_2 (Alpine Linux 3.23 based, 3.13+ compatible)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Toolchain: GCC 14
Toolchain: GCC 15

- x86_64 image: ``quay.io/pypa/musllinux_1_2_x86_64``
- i686 image: ``quay.io/pypa/musllinux_1_2_i686``
Expand Down
16 changes: 6 additions & 10 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [ "${POLICY}" == "manylinux2014" ]; then
fi
elif [ "${POLICY}" == "manylinux_2_28" ]; then
BASEIMAGE="quay.io/almalinuxorg/almalinux:8"
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-14/root"
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-15/root"
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
elif [ "${POLICY}" == "manylinux_2_31" ]; then
Expand All @@ -45,7 +45,7 @@ elif [ "${POLICY}" == "manylinux_2_31" ]; then
LD_LIBRARY_PATH_ARG=
elif [ "${POLICY}" == "manylinux_2_34" ]; then
BASEIMAGE="quay.io/almalinuxorg/almalinux:9"
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-14/root"
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-15/root"
PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
elif [ "${POLICY}" == "manylinux_2_35" ]; then
Expand All @@ -59,15 +59,11 @@ elif [ "${POLICY}" == "manylinux_2_39" ]; then
x86_64) GOARCH="amd64/v2";;
riscv64) BASEIMAGE="rockylinux/rockylinux:10";;
esac
# TODO enable gcc-toolset-15 once available (probably in 10.1)
# DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-15/root"
# PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
# LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
DEVTOOLSET_ROOTPATH=
PREPEND_PATH=
LD_LIBRARY_PATH_ARG=
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-15/root"
PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
elif [ "${POLICY}" == "musllinux_1_2" ]; then
BASEIMAGE="alpine:3.22"
BASEIMAGE="alpine:edge" # TODO 3.23
DEVTOOLSET_ROOTPATH=
PREPEND_PATH=
LD_LIBRARY_PATH_ARG=
Expand Down
5 changes: 0 additions & 5 deletions docker/build_scripts/finalize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,3 @@ LC_ALL=C "${MY_DIR}/update-system-packages.sh"

# wrap compilers (see https://github.com/pypa/manylinux/issues/1725)
"${MY_DIR}/install-gcc-wrapper.sh"

# patch libstdc++.so (see https://github.com/pypa/manylinux/issues/1760)
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
find "${DEVTOOLSET_ROOTPATH}" -name 'libstdc++.so' -exec sed -i 's/INPUT\s*(\s*\([^ ]\+\)\s*\([^ ]\+\)\s*)/INPUT ( \1 \2 \1 )/g' {} \;
fi
8 changes: 1 addition & 7 deletions docker/build_scripts/install-runtime-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,7 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then
else
dnf config-manager --set-enabled crb
fi
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
TOOLCHAIN_DEPS=(gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran gcc-toolset-14-libatomic-devel)
else
# TODO enable gcc-toolset-15 once available (probably in 10.1)
# TOOLCHAIN_DEPS=(gcc-toolset-15-binutils gcc-toolset-15-gcc gcc-toolset-15-gcc-c++ gcc-toolset-15-gcc-gfortran gcc-toolset-15-libatomic-devel)
TOOLCHAIN_DEPS=(binutils gcc gcc-c++ gcc-gfortran libatomic)
fi
TOOLCHAIN_DEPS=(gcc-toolset-15-binutils gcc-toolset-15-gcc gcc-toolset-15-gcc-c++ gcc-toolset-15-gcc-gfortran gcc-toolset-15-libatomic-devel)
elif [ "${OS_ID_LIKE}" == "debian" ]; then
TOOLCHAIN_DEPS+=(binutils gcc g++ gfortran libatomic1)
BASE_TOOLS+=(gpg gpg-agent hardlink hostname locales xz-utils)
Expand Down
Loading