From ca09d54120981a127b2ffcf4cd71c484299b035f Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 11 May 2021 07:19:06 +0200 Subject: [PATCH] Remove manylinux1: End Of Life on March 31st 2017 --- .github/workflows/main.yml | 2 +- Makefile | 56 ++-------------------------------- manylinux1-x64/Dockerfile.in | 27 ---------------- manylinux1-x64/Toolchain.cmake | 11 ------- manylinux1-x86/Dockerfile.in | 30 ------------------ manylinux1-x86/Toolchain.cmake | 15 --------- 6 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 manylinux1-x64/Dockerfile.in delete mode 100644 manylinux1-x64/Toolchain.cmake delete mode 100644 manylinux1-x86/Dockerfile.in delete mode 100644 manylinux1-x86/Toolchain.cmake diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e6712c..92e893f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv6-rpi, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x86, manylinux1-x64, manylinux1-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86] + arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv6-rpi, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 diff --git a/Makefile b/Makefile index 6f8446d..bfa1f2b 100644 --- a/Makefile +++ b/Makefile @@ -9,18 +9,18 @@ DOCKER = docker # Docker organization to pull the images from ORG = dockcross -# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux1-x64) +# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64) BIN = ./bin # These images are built using the "build implicit rule" STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-armv8 linux-armv8-musl linux-armv8-rpi4 linux-armv5 linux-m68k linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv6-rpi linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mips64 linux-mipsel linux-ppc32 linux-ppc64 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 android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mips64 linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 linux-m68k web-wasm linux-armv8 linux-armv8-musl linux-armv8-rpi4 linux-ppc32 linux-ppc64 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-armv7l-musl linux-armv6 linux-armv6-musl linux-armv6-rpi linux-armv5 linux-armv5-musl +GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mips64 linux-mipsel manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 linux-m68k web-wasm linux-armv8 linux-armv8-musl linux-armv8-rpi4 linux-ppc32 linux-ppc64 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-armv7l-musl linux-armv6 linux-armv6-musl linux-armv6-rpi linux-armv5 linux-armv5-musl 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 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 +NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.lib common.label-and-env @@ -173,56 +173,6 @@ manylinux2014-x86.test: manylinux2014-x86 $(DOCKER) run $(RM) dockcross/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86 $(BIN)/dockcross-manylinux2014-x86 /opt/python/cp38-cp38/bin/python test/run.py -# -# manylinux1-x64 -# - -manylinux1-x64: manylinux1-x64/Dockerfile - mkdir -p $@/imagefiles && cp -r imagefiles $@/ - $(DOCKER) build -t $(ORG)/manylinux1-x64:latest \ - --build-arg IMAGE=$(ORG)/manylinux1-x64 \ - --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 manylinux1-x64/Dockerfile . - $(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \ - --build-arg IMAGE=$(ORG)/manylinux1-x64 \ - --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 manylinux1-x64/Dockerfile . - rm -rf $@/imagefiles - -manylinux1-x64.test: manylinux1-x64 - $(DOCKER) run $(RM) dockcross/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64 - $(BIN)/dockcross-manylinux1-x64 /opt/python/cp38-cp38/bin/python test/run.py - -# -# manylinux1-x86 -# - -manylinux1-x86: manylinux1-x86/Dockerfile - mkdir -p $@/imagefiles && cp -r imagefiles $@/ - $(DOCKER) build -t $(ORG)/manylinux1-x86:latest \ - --build-arg IMAGE=$(ORG)/manylinux1-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 manylinux1-x86/Dockerfile . - $(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \ - --build-arg IMAGE=$(ORG)/manylinux1-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 manylinux1-x86/Dockerfile . - rm -rf $@/imagefiles - -manylinux1-x86.test: manylinux1-x86 - $(DOCKER) run $(RM) dockcross/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86 - $(BIN)/dockcross-manylinux1-x86 /opt/python/cp38-cp38/bin/python test/run.py - # # base # diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in deleted file mode 100644 index 4a1f7ea..0000000 --- a/manylinux1-x64/Dockerfile.in +++ /dev/null @@ -1,27 +0,0 @@ -FROM quay.io/pypa/manylinux1_x86_64:latest -MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - -ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64 - -#include "common.manylinux" - -#include "common.dockcross" - -#include "common.docker" - -ENV CROSS_TRIPLE x86_64-linux-gnu -ENV CROSS_ROOT /opt/rh/devtoolset-2/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 manylinux1-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/ -ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake - -#include "common.label-and-env" diff --git a/manylinux1-x64/Toolchain.cmake b/manylinux1-x64/Toolchain.cmake deleted file mode 100644 index b9a4bb2..0000000 --- a/manylinux1-x64/Toolchain.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_CROSSCOMPILING FALSE) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR x86_64) - -set(MANYLINUX1 TRUE) - -set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) -set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) diff --git a/manylinux1-x86/Dockerfile.in b/manylinux1-x86/Dockerfile.in deleted file mode 100644 index 98eacc2..0000000 --- a/manylinux1-x86/Dockerfile.in +++ /dev/null @@ -1,30 +0,0 @@ -FROM quay.io/pypa/manylinux1_i686:latest -MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - -ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86 - -#include "common.manylinux" - -#include "common.dockcross" - -#include "common.docker" - -ENV CROSS_TRIPLE i686-linux-gnu -ENV CROSS_ROOT /opt/rh/devtoolset-2/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 manylinux1-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"] - -#include "common.label-and-env" diff --git a/manylinux1-x86/Toolchain.cmake b/manylinux1-x86/Toolchain.cmake deleted file mode 100644 index eee5eb7..0000000 --- a/manylinux1-x86/Toolchain.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_CROSSCOMPILING FALSE) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR i686) - -set(MANYLINUX1 TRUE) - -set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) -set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) - -# Discard path returned by pkg-config and associated with HINTS in module -# like FindOpenSSL. -set(CMAKE_IGNORE_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/lib/)