Merge pull request #468 from daq-tools/fix-manylinux2014-x86

Fix "yum" on manylinux2014-x86
This commit is contained in:
Matt McCormick 2021-02-01 14:44:24 -05:00 committed by GitHub
commit 5d32ecd8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,7 +13,7 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x86
# Override yum to work around the problem with newly built libcurl.so.4 # Override yum to work around the problem with newly built libcurl.so.4
# https://access.redhat.com/solutions/641093 # https://access.redhat.com/solutions/641093
RUN echo $'#!/bin/bash\n\ RUN echo $'#!/bin/bash\n\
LD_PRELOAD=/usr/lib64/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
ENV CROSS_TRIPLE i686-linux-gnu ENV CROSS_TRIPLE i686-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin