Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions docker/build_scripts/install-runtime-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
# EPEL support (for yasm)
yum -y install https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm
fi
TOOLCHAIN_DEPS+=(yasm)
elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ] || [ "${AUDITWHEEL_ARCH}" == "s390x" ]; then
# Software collection (for devtoolset-10)
yum -y install centos-release-scl-rh
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
# No yasm on i686
# Install mayeut/devtoolset-10 repo to get devtoolset-10
curl -fsSLo /etc/yum.repos.d/mayeut-devtoolset-10.repo https://copr.fedorainfracloud.org/coprs/mayeut/devtoolset-10/repo/custom-1/mayeut-devtoolset-10-custom-1.repo
fi
Expand All @@ -137,9 +135,6 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then
# 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
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
TOOLCHAIN_DEPS+=(yasm)
fi
elif [ "${OS_ID_LIKE}" == "debian" ]; then
TOOLCHAIN_DEPS+=(binutils gcc g++ gfortran libatomic1)
BASE_TOOLS+=(gpg gpg-agent hardlink hostname locales xz-utils)
Expand All @@ -150,6 +145,9 @@ else
echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"
exit 1
fi
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
TOOLCHAIN_DEPS+=(yasm)
fi

manylinux_pkg_install "${BASE_TOOLS[@]}" "${TOOLCHAIN_DEPS[@]}" "${MANYLINUX_DEPS[@]}" "${RUNTIME_DEPS[@]}"

Expand Down
7 changes: 5 additions & 2 deletions docker/tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,12 @@ fi
# check the default shell is /bin/bash
test "$SHELL" = "/bin/bash"

# https://github.com/pypa/manylinux/issues/1725
# check the compiler does not default to x86-64-v?
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
# yasm available
yasm --version

# https://github.com/pypa/manylinux/issues/1725
# check the compiler does not default to x86-64-v?
which gcc
gcc --version
if echo | gcc -S -x c -v - 2>&1 | grep 'march=x86-64-v'; then
Expand Down