Add manylinux2010-x86

2024-09-19 18:20:40 +02:00 · 2019-12-17 10:13:08 -08:00 · 2019-12-17 10:13:08 -08:00 · 2a3efdd548
commit 2a3efdd548
parent 467f7fcfba
6 changed files with 81 additions and 5 deletions
--- a/30
+++ b/30
@ -16,11 +16,11 @@ BIN = ./bin
 STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv5-musl linux-armv6 linux-armv7 linux-armv7a linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix

 # Generated Dockerfiles.
-GEN_IMAGES = linux-s390x linux-mips manylinux1-x64 manylinux1-x86 manylinux2010-x64 web-wasm linux-arm64 windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv5 linux-armv5-musl linux-ppc64le
+GEN_IMAGES = linux-s390x linux-mips manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 web-wasm linux-arm64 windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv5 linux-armv5-musl linux-ppc64le
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))

 # These images are expected to have explicit rules for *both* build and testing
-NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64
+NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86

 DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows

@ -97,7 +97,6 @@ web-wasm.test: web-wasm
 	$(BIN)/dockcross-web-wasm python test/run.py --exe-suffix ".js"
 	rm -rf web-wasm/test

-
 #
 # manylinux2010-x64
 #
@ -123,6 +122,31 @@ manylinux2010-x64.test: manylinux2010-x64
 	$(DOCKER) run $(RM) dockcross/manylinux2010-x64 > $(BIN)/dockcross-manylinux2010-x64 && chmod +x $(BIN)/dockcross-manylinux2010-x64
 	$(BIN)/dockcross-manylinux2010-x64 /opt/python/cp35-cp35m/bin/python test/run.py

+#
+# manylinux2010-x86
+#
+
+manylinux2010-x86: manylinux2010-x86/Dockerfile
+	mkdir -p $@/imagefiles && cp -r imagefiles $@/
+	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2010-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x86/Dockerfile .
+	rm -rf $@/imagefiles
+
+manylinux2010-x86.test: manylinux2010-x86
+	$(DOCKER) run $(RM) dockcross/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86
+	$(BIN)/dockcross-manylinux2010-x86 /opt/python/cp35-cp35m/bin/python test/run.py
+
 #
 # manylinux1-x64
 #
--- a/common.docker
+++ b/common.docker
@ -18,7 +18,7 @@ COPY \
  /buildscripts/

 RUN \
-  X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux1-x86" ] && echo "-32" || echo "") && \
+  X86_FLAG=$([[ "$DEFAULT_DOCKCROSS_IMAGE" =~ dockcross/manylinux.*-x86 ]] && echo "-32" || echo "-XX") && \
  /buildscripts/build-and-install-openssl.sh $X86_FLAG && \
  /buildscripts/build-and-install-openssh.sh && \
  /buildscripts/build-and-install-curl.sh && \
--- a/common.manylinux
+++ b/common.manylinux
@ -23,6 +23,7 @@ RUN \
  # Remove sudo provided by "devtoolset-2" and "devtoolset-8" since it doesn't work with
  # our sudo wrapper calling gosu.
  rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \
+  rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \
  rm -f /opt/rh/devtoolset-8/root/usr/bin/sudo && \
  /buildscripts/install-python-packages.sh && \
  rm -rf /buildscripts
--- a/manylinux2010-x64/Dockerfile.in
+++ b/manylinux2010-x64/Dockerfile.in
@ -1,4 +1,4 @@
-FROM scikitbuild/manylinux2010_x86_64:09d11d5f8
+FROM quay.io/pypa/manylinux2010_x86_64:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64
--- a/manylinux2010-x86/Dockerfile.in
+++ b/manylinux2010-x86/Dockerfile.in
@ -0,0 +1,40 @@
+FROM quay.io/pypa/manylinux2010_i686:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x86
+
+#include "common.manylinux"
+
+#include "common.docker"
+
+ENV CROSS_TRIPLE i686-linux-gnu
+ENV CROSS_ROOT /opt/rh/devtoolset-7/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-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
+
+COPY manylinux2010-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
+
+COPY linux-x86/linux32-entrypoint.sh /dockcross/
+ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG IMAGE=dockcross/manylinux2010-x86
+ARG VERSION=latest
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.version=$VERSION \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
--- a/manylinux2010-x86/Toolchain.cmake
+++ b/manylinux2010-x86/Toolchain.cmake
@ -0,0 +1,11 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_CROSSCOMPILING FALSE)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR i686)
+
+set(MANYLINUX2010 TRUE)
+
+set(CMAKE_C_COMPILER /opt/rh/devtoolset-7/root/usr/bin/gcc)
+set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-7/root/usr/bin/g++)
+set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
+set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-7/root/usr/bin/gfortran)