File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -106,12 +106,10 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
106106 # EPEL support (for yasm)
107107 yum -y install https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm
108108 fi
109- TOOLCHAIN_DEPS+=(yasm)
110109 elif [ " ${AUDITWHEEL_ARCH} " == " aarch64" ] || [ " ${AUDITWHEEL_ARCH} " == " ppc64le" ] || [ " ${AUDITWHEEL_ARCH} " == " s390x" ]; then
111110 # Software collection (for devtoolset-10)
112111 yum -y install centos-release-scl-rh
113112 elif [ " ${AUDITWHEEL_ARCH} " == " i686" ]; then
114- # No yasm on i686
115113 # Install mayeut/devtoolset-10 repo to get devtoolset-10
116114 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
117115 fi
@@ -137,9 +135,6 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then
137135 # 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)
138136 TOOLCHAIN_DEPS=(binutils gcc gcc-c++ gcc-gfortran libatomic)
139137 fi
140- if [ " ${AUDITWHEEL_ARCH} " == " x86_64" ]; then
141- TOOLCHAIN_DEPS+=(yasm)
142- fi
143138elif [ " ${OS_ID_LIKE} " == " debian" ]; then
144139 TOOLCHAIN_DEPS+=(binutils gcc g++ gfortran libatomic1)
145140 BASE_TOOLS+=(gpg gpg-agent hardlink hostname locales xz-utils)
150145 echo " Unsupported policy: '${AUDITWHEEL_POLICY} '"
151146 exit 1
152147fi
148+ if [ " ${AUDITWHEEL_ARCH} " == " x86_64" ]; then
149+ TOOLCHAIN_DEPS+=(yasm)
150+ fi
153151
154152manylinux_pkg_install " ${BASE_TOOLS[@]} " " ${TOOLCHAIN_DEPS[@]} " " ${MANYLINUX_DEPS[@]} " " ${RUNTIME_DEPS[@]} "
155153
Original file line number Diff line number Diff line change 157157# check the default shell is /bin/bash
158158test " $SHELL " = " /bin/bash"
159159
160- # https://github.com/pypa/manylinux/issues/1725
161- # check the compiler does not default to x86-64-v?
162160if [ " ${AUDITWHEEL_ARCH} " == " x86_64" ]; then
161+ # yasm available
162+ yasm --version
163+
164+ # https://github.com/pypa/manylinux/issues/1725
165+ # check the compiler does not default to x86-64-v?
163166 which gcc
164167 gcc --version
165168 if echo | gcc -S -x c -v - 2>&1 | grep ' march=x86-64-v' ; then
You can’t perform that action at this time.
0 commit comments