fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

manylinux2010-x64/Dockerfile.in

@@ -0,0 +1,32 @@
+FROM quay.io/pypa/manylinux2010_x86_64:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64
+
+#include "common.manylinux"
+
+#include "common.dockcross"
+
+#include "common.docker"
+
+# Override yum to work around the problem with newly built libcurl.so.4
+# https://access.redhat.com/solutions/641093
+RUN echo $'#!/bin/bash\n\
+LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
+
+ENV CROSS_TRIPLE x86_64-linux-gnu
+ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/bin
+ENV AS=${CROSS_ROOT}/as \
+    AR=${CROSS_ROOT}/ar \
+    CC=${CROSS_ROOT}/gcc \
+    CPP=${CROSS_ROOT}/cpp \
+    CXX=${CROSS_ROOT}/g++ \
+    LD=${CROSS_ROOT}/ld \
+    FC=${CROSS_ROOT}/gfortran
+
+COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
+
+COPY manylinux2010-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
+
+#include "common.label-and-env"