@@ -35,7 +35,7 @@ if [ "${POLICY}" == "manylinux2014" ]; then
3535 fi
3636elif [ " ${POLICY} " == " manylinux_2_28" ]; then
3737 BASEIMAGE=" quay.io/almalinuxorg/almalinux:8"
38- DEVTOOLSET_ROOTPATH=" /opt/rh/gcc-toolset-14 /root"
38+ DEVTOOLSET_ROOTPATH=" /opt/rh/gcc-toolset-15 /root"
3939 PREPEND_PATH=" ${DEVTOOLSET_ROOTPATH} /usr/bin:"
4040 LD_LIBRARY_PATH_ARG=" ${DEVTOOLSET_ROOTPATH} /usr/lib64:${DEVTOOLSET_ROOTPATH} /usr/lib:${DEVTOOLSET_ROOTPATH} /usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH} /usr/lib/dyninst"
4141elif [ " ${POLICY} " == " manylinux_2_31" ]; then
@@ -45,7 +45,7 @@ elif [ "${POLICY}" == "manylinux_2_31" ]; then
4545 LD_LIBRARY_PATH_ARG=
4646elif [ " ${POLICY} " == " manylinux_2_34" ]; then
4747 BASEIMAGE=" quay.io/almalinuxorg/almalinux:9"
48- DEVTOOLSET_ROOTPATH=" /opt/rh/gcc-toolset-14 /root"
48+ DEVTOOLSET_ROOTPATH=" /opt/rh/gcc-toolset-15 /root"
4949 PREPEND_PATH=" /usr/local/bin:${DEVTOOLSET_ROOTPATH} /usr/bin:"
5050 LD_LIBRARY_PATH_ARG=" ${DEVTOOLSET_ROOTPATH} /usr/lib64:${DEVTOOLSET_ROOTPATH} /usr/lib:${DEVTOOLSET_ROOTPATH} /usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH} /usr/lib/dyninst"
5151elif [ " ${POLICY} " == " manylinux_2_35" ]; then
@@ -59,15 +59,11 @@ elif [ "${POLICY}" == "manylinux_2_39" ]; then
5959 x86_64) GOARCH=" amd64/v2" ;;
6060 riscv64) BASEIMAGE=" rockylinux/rockylinux:10" ;;
6161 esac
62- # TODO enable gcc-toolset-15 once available (probably in 10.1)
63- # DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-15/root"
64- # PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
65- # LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
66- DEVTOOLSET_ROOTPATH=
67- PREPEND_PATH=
68- LD_LIBRARY_PATH_ARG=
62+ DEVTOOLSET_ROOTPATH=" /opt/rh/gcc-toolset-15/root"
63+ PREPEND_PATH=" /usr/local/bin:${DEVTOOLSET_ROOTPATH} /usr/bin:"
64+ LD_LIBRARY_PATH_ARG=" ${DEVTOOLSET_ROOTPATH} /usr/lib64:${DEVTOOLSET_ROOTPATH} /usr/lib:${DEVTOOLSET_ROOTPATH} /usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH} /usr/lib/dyninst"
6965elif [ " ${POLICY} " == " musllinux_1_2" ]; then
70- BASEIMAGE=" alpine:3.22 "
66+ BASEIMAGE=" alpine:edge " # TODO 3.23
7167 DEVTOOLSET_ROOTPATH=
7268 PREPEND_PATH=
7369 LD_LIBRARY_PATH_ARG=
0 commit comments