From 176e7a0bbbf6c295460102d4aa114764e3ee6757 Mon Sep 17 00:00:00 2001 From: "Dieter Demerre (be971243@md2v08qc.ebp.be.siemens-mobility)" Date: Mon, 19 Jul 2021 14:18:59 +0200 Subject: [PATCH 01/27] CYGWIN: introduce cygwin host system awareness. --- imagefiles/dockcross | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/imagefiles/dockcross b/imagefiles/dockcross index a6dc199..4b8d9c4 100755 --- a/imagefiles/dockcross +++ b/imagefiles/dockcross @@ -187,6 +187,8 @@ FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}} UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "") # MSYS, Git Bash, etc. MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "") +# CYGWIN +CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "") if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )") @@ -209,6 +211,11 @@ elif [ -n "$MSYS" ]; then HOST_PWD=$PWD HOST_PWD=${HOST_PWD/\//} HOST_PWD=${HOST_PWD/\//:\/} +elif [ -n "$CYGWIN" ]; then + for f in pwd readlink cygpath ; do + test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ; + done ; + HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ; else HOST_PWD=$PWD [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD) @@ -221,7 +228,11 @@ fi HOST_VOLUMES= if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then - HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" + if test -n "${CYGWIN}" ; then + HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ; + else + HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ; + fi ; fi #------------------------------------------------------------------------------ From 8873943b537f7565fe3ccd22c1c9541903fbb9bc Mon Sep 17 00:00:00 2001 From: Aaron Simmons Date: Tue, 20 Jul 2021 18:42:58 +0000 Subject: [PATCH 02/27] #529: changing QEMU_VERSION from ENV to ARG so that it won't be in the environment of the running container --- linux-m68k-uclibc/Dockerfile.in | 2 +- linux-ppc64le/Dockerfile.in | 2 +- linux-riscv32/Dockerfile.in | 2 +- linux-riscv64/Dockerfile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in index 3a3bc4e..bcedd8c 100644 --- a/linux-m68k-uclibc/Dockerfile.in +++ b/linux-m68k-uclibc/Dockerfile.in @@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # crosstool-ng master 2021-07-07 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 -ENV QEMU_VERSION 6.0.0 +ARG QEMU_VERSION=6.0.0 #include "common.crosstool" diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in index c3e5f96..9ae0583 100644 --- a/linux-ppc64le/Dockerfile.in +++ b/linux-ppc64le/Dockerfile.in @@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # crosstool-ng master 2021-07-07 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 -ENV QEMU_VERSION 6.0.0 +ARG QEMU_VERSION=6.0.0 #include "common.crosstool" diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in index 312357b..03cb82c 100644 --- a/linux-riscv32/Dockerfile.in +++ b/linux-riscv32/Dockerfile.in @@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # crosstool-ng master 2021-07-07 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 -ENV QEMU_VERSION 6.0.0 +ARG QEMU_VERSION=6.0.0 #include "common.crosstool" diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in index 0a728a0..c80dbe3 100644 --- a/linux-riscv64/Dockerfile.in +++ b/linux-riscv64/Dockerfile.in @@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # crosstool-ng master 2021-07-07 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 -ENV QEMU_VERSION 6.0.0 +ARG QEMU_VERSION=6.0.0 #include "common.crosstool" From cd5979a3c9ddd8f64b917306df01ded447f38d56 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 23 Jul 2021 23:52:07 +0200 Subject: [PATCH 03/27] Update CI Signed-off-by: Bensuperpc --- .github/workflows/expired.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/expired.yml b/.github/workflows/expired.yml index e87ff16..476d8c8 100644 --- a/.github/workflows/expired.yml +++ b/.github/workflows/expired.yml @@ -6,7 +6,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v4 with: repo-token: ${{ secrets.GITHUB_TOKEN }} exempt-issue-milestones: 'future,alpha,beta,release' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89b5898..2799ce6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: image: name: ${{ matrix.arch_name }} needs: base - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: From f50d66b287aed6d50a88ade4a08492a307cb599e Mon Sep 17 00:00:00 2001 From: "Dieter Demerre (be971243@md2v08qc.ebp.be.siemens-mobility)" Date: Mon, 26 Jul 2021 09:44:24 +0200 Subject: [PATCH 04/27] empty commit - to trigger new build in pull request. From 882a67b9d29688a2e3a8305087a879742fdf79f9 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 00:47:26 +0200 Subject: [PATCH 05/27] Add shellcheck Add shellcheck CI and shellcheck in Makefile (bash-check rule) Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 26 ++++++++++++++++++++++++++ Makefile | 11 +++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .github/workflows/shellcheck.yml diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml new file mode 100644 index 0000000..9f47530 --- /dev/null +++ b/.github/workflows/shellcheck.yml @@ -0,0 +1,26 @@ +name: Shellcheck CI + +on: + push: + branches: + - '*' + paths-ignore: + - '**/README.md' + pull_request: + branches: + - '*' + paths-ignore: + - '**/README.md' + workflow_dispatch: + +jobs: + shellcheck: + name: Shellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Run ShellCheck + uses: ludeeus/action-shellcheck@master + with: + severity: warning + format: gcc \ No newline at end of file diff --git a/Makefile b/Makefile index 23eb6e4..8b48621 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,12 @@ endif # Tag images with date and Git short hash in addition to revision TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD) +# shellcheck executable +SHELLCHECK := shellcheck + +# Defines the level of verification (error, warning, info...) +SHELLCHECK_SEVERITY_LEVEL := error + # # images: This target builds all IMAGES (because it is the first one, it is built by default) # @@ -275,6 +281,11 @@ purge: clean # Remove all images with organization (ex dockcross/*) $(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f +# Check bash syntax +bash-check: + find . -type f \( -name "*.sh" -o -name "*.bash" \) -print0 | xargs -0 -P"$(shell nproc)" -I{} \ + $(SHELLCHECK) --check-sourced --color=auto --format=gcc --severity=error --shell=bash --enable=all "{}" + # # testing implicit rule # From 84e12b0f66cab77964465833bda38a8eecefe8a1 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 00:51:25 +0200 Subject: [PATCH 06/27] Reduce shellcheck to error only (Will be changed later) Reduce shellcheck to error only (Will be changed later) Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 9f47530..c7376bf 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -22,5 +22,5 @@ jobs: - name: Run ShellCheck uses: ludeeus/action-shellcheck@master with: - severity: warning + severity: error format: gcc \ No newline at end of file From 92efe118b3c78bff5fea26463049530619fe1439 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 00:52:33 +0200 Subject: [PATCH 07/27] Revert "Reduce shellcheck to error only (Will be changed later)" This reverts commit 84e12b0f66cab77964465833bda38a8eecefe8a1. --- .github/workflows/shellcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index c7376bf..9f47530 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -22,5 +22,5 @@ jobs: - name: Run ShellCheck uses: ludeeus/action-shellcheck@master with: - severity: error + severity: warning format: gcc \ No newline at end of file From d02099ad95d02e958752cadcf9cf5d8d27bb6354 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 01:03:00 +0200 Subject: [PATCH 08/27] Change to bash in shellcheck and rename dockcross script to dockcross.sh Change to bash in shellcheck and rename dockcross script to dockcross.sh Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 6 ++++-- imagefiles/{dockcross => dockcross.sh} | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename imagefiles/{dockcross => dockcross.sh} (99%) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 9f47530..a9a749f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -22,5 +22,7 @@ jobs: - name: Run ShellCheck uses: ludeeus/action-shellcheck@master with: - severity: warning - format: gcc \ No newline at end of file + severity: error + format: gcc + env: + SHELLCHECK_OPTS: bash \ No newline at end of file diff --git a/imagefiles/dockcross b/imagefiles/dockcross.sh similarity index 99% rename from imagefiles/dockcross rename to imagefiles/dockcross.sh index a6dc199..5d7bedd 100755 --- a/imagefiles/dockcross +++ b/imagefiles/dockcross.sh @@ -6,11 +6,11 @@ DEFAULT_DOCKCROSS_IMAGE=dockcross/base # DO NOT MOVE THIS LINE (see entrypoint. # Helpers # err() { - echo -e >&2 ERROR: $@\\n + echo -e >&2 "ERROR: $*\n" } die() { - err $@ + err "$*" exit 1 } From 8ce154f1b24add811ebbac6829b930f27d8f5a9c Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 01:07:09 +0200 Subject: [PATCH 09/27] Remove bash in env Remove bash in env Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index a9a749f..c7376bf 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -23,6 +23,4 @@ jobs: uses: ludeeus/action-shellcheck@master with: severity: error - format: gcc - env: - SHELLCHECK_OPTS: bash \ No newline at end of file + format: gcc \ No newline at end of file From 50b57169e7c82c3fce0950a238766cf3fca83f72 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 01:08:52 +0200 Subject: [PATCH 10/27] Revert "Remove bash in env" This reverts commit 8ce154f1b24add811ebbac6829b930f27d8f5a9c. --- .github/workflows/shellcheck.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index c7376bf..a9a749f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -23,4 +23,6 @@ jobs: uses: ludeeus/action-shellcheck@master with: severity: error - format: gcc \ No newline at end of file + format: gcc + env: + SHELLCHECK_OPTS: bash \ No newline at end of file From 55eb3b7c96a39327f0c9443ea0ecdb23fa457931 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 01:09:09 +0200 Subject: [PATCH 11/27] Fix bash error in shellcheck Fix bash error in shellcheck Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index a9a749f..1451f7a 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -25,4 +25,4 @@ jobs: severity: error format: gcc env: - SHELLCHECK_OPTS: bash \ No newline at end of file + SHELLCHECK_OPTS: -s bash \ No newline at end of file From cc5961492e7fe3798184ceef8c13cb811547dddd Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 01:12:43 +0200 Subject: [PATCH 12/27] Fix wrong file name Fix wrong file name Signed-off-by: Bensuperpc --- common/common.dockcross | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common.dockcross b/common/common.dockcross index f2513dc..01d969b 100644 --- a/common/common.dockcross +++ b/common/common.dockcross @@ -13,4 +13,4 @@ RUN \ rm -rf /buildscripts # Runtime scripts -COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/ +COPY imagefiles/entrypoint.sh imagefiles/dockcross.sh /dockcross/ From 04f84bc4edf19729acce16fc77135d885b5eefb4 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 3 Aug 2021 15:08:31 +0200 Subject: [PATCH 13/27] Fix end file Fix end file Signed-off-by: Bensuperpc --- .github/workflows/shellcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 1451f7a..2e183f9 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -25,4 +25,4 @@ jobs: severity: error format: gcc env: - SHELLCHECK_OPTS: -s bash \ No newline at end of file + SHELLCHECK_OPTS: -s bash From 8f19ce75f0d5844b51bd4aab7098ff3668e4f7c1 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 11:17:08 +0200 Subject: [PATCH 14/27] Fix wrong file name in entrypoint dockcross -> dockcross.sh Fix wrong file name in entrypoint dockcross -> dockcross.sh Signed-off-by: Bensuperpc --- imagefiles/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imagefiles/entrypoint.sh b/imagefiles/entrypoint.sh index 103ab14..6b24ac8 100755 --- a/imagefiles/entrypoint.sh +++ b/imagefiles/entrypoint.sh @@ -7,13 +7,13 @@ if [[ $# == 0 ]]; then # Presumably the image has been run directly, so help the user get # started by outputting the dockcross script if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then - head -n 2 /dockcross/dockcross + head -n 2 /dockcross/dockcross.sh echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE" - tail -n +4 /dockcross/dockcross | + tail -n +4 /dockcross/dockcross.sh | sed -e "s@dockcross\/linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE}@g" | sed -e "s@dockcross\-linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE//[\/:]/-}@g" else - cat /dockcross/dockcross + cat /dockcross/dockcross.sh fi exit 0 fi From ca7679dc14bf365b82f9d646e6c70fe54209131f Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 13:14:05 +0200 Subject: [PATCH 15/27] Fix clang image Fix clang image Signed-off-by: Bensuperpc --- linux-x64-clang/Dockerfile.in | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in index e362e65..cf7027e 100644 --- a/linux-x64-clang/Dockerfile.in +++ b/linux-x64-clang/Dockerfile.in @@ -1,26 +1,33 @@ FROM dockcross/base:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - # flang + +ARG CLANG_VERSION=13 +ENV CLANG_VERSION=${CLANG_VERSION} + RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ + && echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \ && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ + && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && apt-get update \ && apt-get purge --autoremove -y gcc g++ software-properties-common \ - && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \ + && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} \ && apt-get clean --yes \ && rm -rf /var/lib/apt/lists/* \ - && update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \ - && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \ - && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \ + && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \ && cc --version \ && c++ --version \ && cpp --version ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_ROOT /usr/bin -ENV CC=/usr/bin/clang \ +ENV CC=/usr/bin/clang \ CPP=/usr/bin/cpp \ - CXX=/usr/bin/clang++ \ + CXX=/usr/bin/clang++ \ LD=/usr/bin/lld \ FC=/usr/bin/flang From 4fd8fb9e095984901e33f0a0649ba66cb8fb9eee Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 14:17:15 +0200 Subject: [PATCH 16/27] Update makefile image variable Update makefile image variable Signed-off-by: Bensuperpc --- Makefile | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8b48621..f03ccea 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,25 @@ ORG = dockcross 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-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-riscv64 linux-riscv32 linux-m68k-uclibc +STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \ + linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \ + linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl \ + linux-mips linux-ppc64le linux-riscv64 linux-riscv32 \ + windows-static-x86 windows-static-x64 windows-static-x64-posix \ + windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \ + linux-m68k-uclibc linux-s390x # Generated Dockerfiles. -GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl 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-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc +GEN_IMAGES = android-arm android-arm64 \ + linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \ + manylinux1-x64 manylinux1-x86 manylinux2010-x64 \ + manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 \ + manylinux2014-aarch64 web-wasm linux-mips \ + 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-armv5 linux-armv5-musl linux-ppc64le linux-s390x \ + linux-riscv64 linux-riscv32 linux-m68k-uclibc GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) @@ -33,6 +48,7 @@ IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES) # Optional arguments for test runner (test/run.py) associated with "testing implicit rule" linux-ppc64le.test_ARGS = --languages C +linux-x64-tinycc.test_ARGS = --languages C windows-static-x86.test_ARGS = --exe-suffix ".exe" windows-static-x64.test_ARGS = --exe-suffix ".exe" windows-static-x64-posix.test_ARGS = --exe-suffix ".exe" From 55138d52e0cac44035c6338768c9f8393754be97 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 14:21:05 +0200 Subject: [PATCH 17/27] Update makefile N2 Update makefile N2 Signed-off-by: Bensuperpc --- Makefile | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f03ccea..b0cb555 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ BIN = ./bin # These images are built using the "build implicit rule" STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \ linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \ - linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl \ + linux-armv5 linux-armv6 linux-armv7 linux-armv7a \ + linux-armv5-musl linux-armv6-musl linux-armv7l-musl \ linux-mips linux-ppc64le linux-riscv64 linux-riscv32 \ windows-static-x86 windows-static-x64 windows-static-x64-posix \ windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \ @@ -47,7 +48,6 @@ DOCKER_COMPOSITE_PATH = $(addprefix $(DOCKER_COMPOSITE_FOLDER_PATH),$(DOCKER_COM IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES) # Optional arguments for test runner (test/run.py) associated with "testing implicit rule" -linux-ppc64le.test_ARGS = --languages C linux-x64-tinycc.test_ARGS = --languages C windows-static-x86.test_ARGS = --exe-suffix ".exe" windows-static-x64.test_ARGS = --exe-suffix ".exe" @@ -135,7 +135,8 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile rm -rf $@/imagefiles manylinux2014-aarch64.test: manylinux2014-aarch64 - $(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 && chmod +x $(BIN)/dockcross-manylinux2014-aarch64 + $(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 \ + && chmod +x $(BIN)/dockcross-manylinux2014-aarch64 $(BIN)/dockcross-manylinux2014-aarch64 /opt/python/cp38-cp38/bin/python test/run.py # @@ -153,7 +154,8 @@ manylinux2014-x64: manylinux2014-x64/Dockerfile rm -rf $@/imagefiles manylinux2014-x64.test: manylinux2014-x64 - $(DOCKER) run $(RM) $(ORG)/manylinux2014-x64 > $(BIN)/dockcross-manylinux2014-x64 && chmod +x $(BIN)/dockcross-manylinux2014-x64 + $(DOCKER) run $(RM) $(ORG)/manylinux2014-x64 > $(BIN)/dockcross-manylinux2014-x64 \ + && chmod +x $(BIN)/dockcross-manylinux2014-x64 $(BIN)/dockcross-manylinux2014-x64 /opt/python/cp38-cp38/bin/python test/run.py # @@ -171,7 +173,8 @@ manylinux2014-x86: manylinux2014-x86/Dockerfile rm -rf $@/imagefiles manylinux2014-x86.test: manylinux2014-x86 - $(DOCKER) run $(RM) $(ORG)/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86 + $(DOCKER) run $(RM) $(ORG)/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 # @@ -190,7 +193,8 @@ manylinux2010-x64: manylinux2010-x64/Dockerfile rm -rf $@/imagefiles manylinux2010-x64.test: manylinux2010-x64 - $(DOCKER) run $(RM) dockcross/manylinux2010-x64 > $(BIN)/dockcross-manylinux2010-x64 && chmod +x $(BIN)/dockcross-manylinux2010-x64 + $(DOCKER) run $(RM) dockcross/manylinux2010-x64 > $(BIN)/dockcross-manylinux2010-x64 \ + && chmod +x $(BIN)/dockcross-manylinux2010-x64 $(BIN)/dockcross-manylinux2010-x64 /opt/python/cp38-cp38/bin/python test/run.py # @@ -209,7 +213,8 @@ manylinux2010-x86: manylinux2010-x86/Dockerfile rm -rf $@/imagefiles manylinux2010-x86.test: manylinux2010-x86 - $(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86 + $(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 \ + && chmod +x $(BIN)/dockcross-manylinux2010-x86 $(BIN)/dockcross-manylinux2010-x86 /opt/python/cp38-cp38/bin/python test/run.py # @@ -228,7 +233,8 @@ manylinux1-x64: manylinux1-x64/Dockerfile rm -rf $@/imagefiles manylinux1-x64.test: manylinux1-x64 - $(DOCKER) run $(RM) $(ORG)/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64 + $(DOCKER) run $(RM) $(ORG)/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 # @@ -247,7 +253,8 @@ manylinux1-x86: manylinux1-x86/Dockerfile rm -rf $@/imagefiles manylinux1-x86.test: manylinux1-x86 - $(DOCKER) run $(RM) $(ORG)/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86 + $(DOCKER) run $(RM) $(ORG)/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 # @@ -307,7 +314,8 @@ bash-check: # .SECONDEXPANSION: $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@) - $(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@) + $(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) \ + && chmod +x $(BIN)/dockcross-$(basename $@) $(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS) # From a38a7920ac5de394dc3e3616f259e8abd90ce1f3 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 14:33:15 +0200 Subject: [PATCH 18/27] Update makefile N3 Update makefile N3 Signed-off-by: Bensuperpc --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b0cb555..792c04a 100644 --- a/Makefile +++ b/Makefile @@ -37,10 +37,13 @@ GEN_IMAGES = android-arm android-arm64 \ 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 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 +NON_STANDARD_IMAGES = manylinux1-x64 manylinux1-x86 manylinux2010-x64 \ + manylinux2010-x86 manylinux2014-aarch64 \ + manylinux2014-x64 manylinux2014-x86 web-wasm # Docker composite files -DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env +DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux \ + common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env DOCKER_COMPOSITE_FOLDER_PATH = common/ DOCKER_COMPOSITE_PATH = $(addprefix $(DOCKER_COMPOSITE_FOLDER_PATH),$(DOCKER_COMPOSITE_SOURCES)) @@ -294,13 +297,13 @@ $(STANDARD_IMAGES): %: %/Dockerfile base rm -rf $@/imagefiles clean: - for d in $(STANDARD_IMAGES) ; do rm -rf $$d/imagefiles ; done + for d in $(GEN_IMAGES) ; do rm -rf $$d/imagefiles ; done for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d ; done rm -f Dockerfile purge: clean # Remove all untagged images - $(DOCKER) container ls -aq | xargs --no-run-if-empty $(DOCKER) container rm -f + $(DOCKER) container ls -aq | xargs -r $(DOCKER) container rm -f # Remove all images with organization (ex dockcross/*) $(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f @@ -326,4 +329,4 @@ test.prerequisites: $(addsuffix .test,base $(IMAGES)): test.prerequisites -.PHONY: base images $(IMAGES) test %.test clean purge +.PHONY: base images $(IMAGES) test %.test clean purge bash-check display_images From afd21c490ef91dde6fe86da17308b31e5bb50460 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 14:40:29 +0200 Subject: [PATCH 19/27] Update makefile N4 Update makefile N4 Signed-off-by: Bensuperpc --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 792c04a..e1ce995 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,8 @@ $(STANDARD_IMAGES): %: %/Dockerfile base rm -rf $@/imagefiles clean: - for d in $(GEN_IMAGES) ; do rm -rf $$d/imagefiles ; done + for d in $(IMAGES) ; do rm -rf $$d/imagefiles ; done + for d in $(IMAGES) ; do rm -rf $(BIN)/dockcross-$$d ; done for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d ; done rm -f Dockerfile From f22865db7f94fbaad46b85ff32275548d6ac6b5a Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 15:12:10 +0200 Subject: [PATCH 20/27] Update crosstool-ng, mxe and wasm Update crosstool-ng, mxe and wasm Signed-off-by: Bensuperpc --- common/common.windows | 4 ++-- linux-arm64/Dockerfile.in | 4 ++-- linux-armv5-musl/Dockerfile.in | 4 ++-- linux-armv5/Dockerfile.in | 4 ++-- linux-armv6/Dockerfile.in | 4 ++-- linux-armv7/Dockerfile.in | 4 ++-- linux-armv7a/Dockerfile.in | 4 ++-- linux-m68k-uclibc/Dockerfile.in | 4 ++-- linux-mips/Dockerfile.in | 4 ++-- linux-ppc64le/Dockerfile.in | 4 ++-- linux-riscv32/Dockerfile.in | 4 ++-- linux-riscv64/Dockerfile.in | 4 ++-- linux-s390x/Dockerfile.in | 4 ++-- web-wasm/Dockerfile.in | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/common.windows b/common/common.windows index ec8d09c..0d71e6c 100644 --- a/common/common.windows +++ b/common/common.windows @@ -15,8 +15,8 @@ # ARG MXE_TARGET_LINK=shared # -# mxe master 2021-07-07 -ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298 +# mxe master 2021-08-04 +ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in index d710e50..814152a 100644 --- a/linux-arm64/Dockerfile.in +++ b/linux-arm64/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5-musl/Dockerfile.in b/linux-armv5-musl/Dockerfile.in index 86e68ee..5928f16 100755 --- a/linux-armv5-musl/Dockerfile.in +++ b/linux-armv5-musl/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # musleabi as default glibc # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in index 4e7c045..9883a80 100644 --- a/linux-armv5/Dockerfile.in +++ b/linux-armv5/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in index 630c814..15070e3 100644 --- a/linux-armv6/Dockerfile.in +++ b/linux-armv6/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv6 Linux # Raspberry Pi is ARMv6+VFP2 diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in index 8ba204a..9e5b646 100644 --- a/linux-armv7/Dockerfile.in +++ b/linux-armv7/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv7 Linux #include "common.crosstool" diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in index 56e1833..3afd57a 100644 --- a/linux-armv7a/Dockerfile.in +++ b/linux-armv7a/Dockerfile.in @@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # This is for 32-bit ARMv7 Linux # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in index bcedd8c..cc2e259 100644 --- a/linux-m68k-uclibc/Dockerfile.in +++ b/linux-m68k-uclibc/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in index 2af6798..a288424 100644 --- a/linux-mips/Dockerfile.in +++ b/linux-mips/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in index 9ae0583..af74e8d 100644 --- a/linux-ppc64le/Dockerfile.in +++ b/linux-ppc64le/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in index 03cb82c..fa5b681 100644 --- a/linux-riscv32/Dockerfile.in +++ b/linux-riscv32/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in index c80dbe3..61b9f04 100644 --- a/linux-riscv64/Dockerfile.in +++ b/linux-riscv64/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in index d7004ad..b5d9464 100644 --- a/linux-s390x/Dockerfile.in +++ b/linux-s390x/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index 47d500b..94f7d29 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:2.0.25 +FROM emscripten/emsdk:2.0.26 MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python #include "common.docker" -ENV EMSCRIPTEN_VERSION 2.0.25 +ENV EMSCRIPTEN_VERSION 2.0.26 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} ENV CC=/emsdk/upstream/emscripten/emcc \ From 91c5bee3a735fbe66ee379fe5f0e19224d8e0d89 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 5 Aug 2021 16:28:23 +0200 Subject: [PATCH 21/27] Add ARMv6 LTS With Glibc 2.28 Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 +- Makefile | 4 +- linux-armv6-lts/Dockerfile.in | 45 ++ linux-armv6-lts/Toolchain.cmake | 19 + linux-armv6-lts/crosstool-ng.config | 906 ++++++++++++++++++++++++++++ 5 files changed, 973 insertions(+), 3 deletions(-) create mode 100644 linux-armv6-lts/Dockerfile.in create mode 100644 linux-armv6-lts/Toolchain.cmake create mode 100644 linux-armv6-lts/crosstool-ng.config diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2799ce6..de0a849 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-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, linux-riscv64, linux-riscv32, linux-m68k-uclibc] + arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-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, linux-riscv64, linux-riscv32, linux-m68k-uclibc] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 diff --git a/Makefile b/Makefile index 8b48621..d2ba3ad 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ ORG = dockcross 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-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-riscv64 linux-riscv32 linux-m68k-uclibc +STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-armv6-lts # Generated Dockerfiles. -GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl 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-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc +GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl 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-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-armv6-lts GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) diff --git a/linux-armv6-lts/Dockerfile.in b/linux-armv6-lts/Dockerfile.in new file mode 100644 index 0000000..15070e3 --- /dev/null +++ b/linux-armv6-lts/Dockerfile.in @@ -0,0 +1,45 @@ +FROM dockcross/base:latest +MAINTAINER Matt McCormick "matt.mccormick@kitware.com" + +# Crosstool-ng version +# We use a git commit while waiting for 1.25 to release (1.24 is several years old) +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e + +# This is for 32-bit ARMv6 Linux +# Raspberry Pi is ARMv6+VFP2 +#include "common.crosstool" + +# The cross-compiling emulator +RUN apt-get update \ +&& apt-get install -y \ + qemu-user \ + qemu-user-static \ +&& apt-get clean --yes + + +# The CROSS_TRIPLE is a configured alias of the "armv6-unknown-linux-gnueabihf" target. +ENV CROSS_TRIPLE armv6-unknown-linux-gnueabihf +ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE} +ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ + AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ + CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \ + CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ + CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \ + LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ + FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran + +ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" +ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" + +COPY Toolchain.cmake ${CROSS_ROOT}/ +ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake + +ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/ + +# Linux kernel cross compilation variables +ENV PATH ${PATH}:${CROSS_ROOT}/bin +ENV CROSS_COMPILE ${CROSS_TRIPLE}- +ENV ARCH arm + +#include "common.label-and-env" diff --git a/linux-armv6-lts/Toolchain.cmake b/linux-armv6-lts/Toolchain.cmake new file mode 100644 index 0000000..f2965db --- /dev/null +++ b/linux-armv6-lts/Toolchain.cmake @@ -0,0 +1,19 @@ +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR arm) +set(cross_triple "armv6-unknown-linux-gnueabihf") +set(cross_root /usr/xcc/${cross_triple}) + +set(CMAKE_C_COMPILER $ENV{CC}) +set(CMAKE_CXX_COMPILER $ENV{CXX}) +set(CMAKE_Fortran_COMPILER $ENV{FC}) + +set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") + +set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) +set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot) + +set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm) diff --git a/linux-armv6-lts/crosstool-ng.config b/linux-armv6-lts/crosstool-ng.config new file mode 100644 index 0000000..0b5e548 --- /dev/null +++ b/linux-armv6-lts/crosstool-ng.config @@ -0,0 +1,906 @@ +# +# Automatically generated file; DO NOT EDIT. +# crosstool-NG 1.24.0.385_9e10cb6 Configuration +# +CT_CONFIGURE_has_static_link=y +CT_CONFIGURE_has_cxx11=y +CT_CONFIGURE_has_wget=y +CT_CONFIGURE_has_curl=y +CT_CONFIGURE_has_meson=y +CT_CONFIGURE_has_ninja=y +CT_CONFIGURE_has_make_3_81_or_newer=y +CT_CONFIGURE_has_make_4_0_or_newer=y +CT_CONFIGURE_has_libtool_2_4_or_newer=y +CT_CONFIGURE_has_libtoolize_2_4_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y +CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y +CT_CONFIGURE_has_python_3_4_or_newer=y +CT_CONFIGURE_has_bison_2_7_or_newer=y +CT_CONFIGURE_has_python=y +CT_CONFIGURE_has_dtc=y +CT_CONFIGURE_has_cvs=y +CT_CONFIGURE_has_git=y +CT_CONFIGURE_has_md5sum=y +CT_CONFIGURE_has_sha1sum=y +CT_CONFIGURE_has_sha256sum=y +CT_CONFIGURE_has_sha512sum=y +CT_CONFIGURE_has_install_with_strip_program=y +CT_VERSION="1.24.0.385_9e10cb6" +CT_VCHECK="" +CT_CONFIG_VERSION_ENV="3" +CT_CONFIG_VERSION_CURRENT="3" +CT_CONFIG_VERSION="3" +CT_MODULES=y + +# +# Paths and misc options +# + +# +# crosstool-NG behavior +# +# CT_OBSOLETE is not set +# CT_EXPERIMENTAL is not set +# CT_DEBUG_CT is not set + +# +# Paths +# +CT_LOCAL_TARBALLS_DIR="${HOME}/src" +CT_SAVE_TARBALLS=y +# CT_TARBALLS_BUILDROOT_LAYOUT is not set +CT_WORK_DIR="${CT_TOP_DIR}/.build" +CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" +CT_BUILD_DIR="${CT_BUILD_TOP_DIR}/build" +CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" +CT_RM_RF_PREFIX_DIR=y +CT_REMOVE_DOCS=y +CT_INSTALL_LICENSES=y +CT_PREFIX_DIR_RO=y +CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y +# CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set + +# +# Downloading +# +CT_DOWNLOAD_AGENT_WGET=y +# CT_DOWNLOAD_AGENT_CURL is not set +# CT_DOWNLOAD_AGENT_NONE is not set +# CT_FORBID_DOWNLOAD is not set +# CT_FORCE_DOWNLOAD is not set +CT_CONNECT_TIMEOUT=10 +CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" +# CT_ONLY_DOWNLOAD is not set +# CT_USE_MIRROR is not set +CT_VERIFY_DOWNLOAD_DIGEST=y +CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y +# CT_VERIFY_DOWNLOAD_DIGEST_SHA256 is not set +# CT_VERIFY_DOWNLOAD_DIGEST_SHA1 is not set +# CT_VERIFY_DOWNLOAD_DIGEST_MD5 is not set +CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512" +# CT_VERIFY_DOWNLOAD_SIGNATURE is not set + +# +# Extracting +# +# CT_FORCE_EXTRACT is not set +CT_OVERRIDE_CONFIG_GUESS_SUB=y +# CT_ONLY_EXTRACT is not set +CT_PATCH_BUNDLED=y +# CT_PATCH_BUNDLED_LOCAL is not set +CT_PATCH_ORDER="bundled" + +# +# Build behavior +# +CT_PARALLEL_JOBS=4 +CT_LOAD="" +CT_USE_PIPES=y +CT_EXTRA_CFLAGS_FOR_BUILD="" +CT_EXTRA_LDFLAGS_FOR_BUILD="" +CT_EXTRA_CFLAGS_FOR_HOST="" +CT_EXTRA_LDFLAGS_FOR_HOST="" +# CT_CONFIG_SHELL_SH is not set +# CT_CONFIG_SHELL_ASH is not set +CT_CONFIG_SHELL_BASH=y +# CT_CONFIG_SHELL_CUSTOM is not set +CT_CONFIG_SHELL="${bash}" + +# +# Logging +# +# CT_LOG_ERROR is not set +# CT_LOG_WARN is not set +# CT_LOG_INFO is not set +CT_LOG_EXTRA=y +# CT_LOG_ALL is not set +# CT_LOG_DEBUG is not set +CT_LOG_LEVEL_MAX="EXTRA" +# CT_LOG_SEE_TOOLS_WARN is not set +CT_LOG_PROGRESS_BAR=y +CT_LOG_TO_FILE=y +CT_LOG_FILE_COMPRESS=y +# end of Paths and misc options + +# +# Target options +# +# CT_ARCH_ALPHA is not set +# CT_ARCH_ARC is not set +CT_ARCH_ARM=y +# CT_ARCH_AVR is not set +# CT_ARCH_M68K is not set +# CT_ARCH_MIPS is not set +# CT_ARCH_NIOS2 is not set +# CT_ARCH_POWERPC is not set +# CT_ARCH_PRU is not set +# CT_ARCH_S390 is not set +# CT_ARCH_SH is not set +# CT_ARCH_SPARC is not set +# CT_ARCH_X86 is not set +# CT_ARCH_XTENSA is not set +CT_ARCH="arm" +CT_ARCH_CHOICE_KSYM="ARM" +CT_ARCH_CPU="arm1176jzf-s" +CT_ARCH_ARM_SHOW=y + +# +# Options for arm +# +CT_ARCH_ARM_PKG_KSYM="" +CT_ARCH_ARM_MODE="arm" +CT_ARCH_ARM_MODE_ARM=y +# CT_ARCH_ARM_MODE_THUMB is not set +# CT_ARCH_ARM_INTERWORKING is not set +CT_ARCH_ARM_EABI_FORCE=y +CT_ARCH_ARM_EABI=y +CT_ARCH_ARM_TUPLE_USE_EABIHF=y +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ARCH_SUFFIX="v6" +# CT_OMIT_TARGET_VENDOR is not set + +# +# Generic target options +# +# CT_MULTILIB is not set +CT_DEMULTILIB=y +CT_ARCH_SUPPORTS_BOTH_MMU=y +CT_ARCH_DEFAULT_HAS_MMU=y +CT_ARCH_USE_MMU=y +CT_ARCH_SUPPORTS_FLAT_FORMAT=y +CT_ARCH_SUPPORTS_EITHER_ENDIAN=y +CT_ARCH_DEFAULT_LE=y +# CT_ARCH_BE is not set +CT_ARCH_LE=y +CT_ARCH_ENDIAN="little" +CT_ARCH_SUPPORTS_32=y +CT_ARCH_SUPPORTS_64=y +CT_ARCH_DEFAULT_32=y +CT_ARCH_BITNESS=32 +CT_ARCH_32=y +# CT_ARCH_64 is not set + +# +# Target optimisations +# +CT_ARCH_SUPPORTS_WITH_ARCH=y +CT_ARCH_SUPPORTS_WITH_CPU=y +CT_ARCH_SUPPORTS_WITH_TUNE=y +CT_ARCH_SUPPORTS_WITH_FLOAT=y +CT_ARCH_SUPPORTS_WITH_FPU=y +CT_ARCH_SUPPORTS_SOFTFP=y +CT_ARCH_EXCLUSIVE_WITH_CPU=y +CT_ARCH_FPU="vfp" +# CT_ARCH_FLOAT_AUTO is not set +CT_ARCH_FLOAT_HW=y +# CT_ARCH_FLOAT_SOFTFP is not set +# CT_ARCH_FLOAT_SW is not set +CT_TARGET_CFLAGS="" +CT_TARGET_LDFLAGS="" +CT_ARCH_FLOAT="hard" +# end of Target options + +# +# Toolchain options +# + +# +# General toolchain options +# +CT_FORCE_SYSROOT=y +CT_USE_SYSROOT=y +CT_SYSROOT_NAME="sysroot" +CT_SYSROOT_DIR_PREFIX="" +CT_WANTS_STATIC_LINK=y +CT_WANTS_STATIC_LINK_CXX=y +# CT_STATIC_TOOLCHAIN is not set +CT_SHOW_CT_VERSION=y +CT_TOOLCHAIN_PKGVERSION="" +CT_TOOLCHAIN_BUGURL="" + +# +# Tuple completion and aliasing +# +CT_TARGET_VENDOR="" +CT_TARGET_ALIAS_SED_EXPR="" +CT_TARGET_ALIAS="" + +# +# Toolchain type +# +CT_CROSS=y +# CT_CANADIAN is not set +CT_TOOLCHAIN_TYPE="cross" + +# +# Build system +# +CT_BUILD="" +CT_BUILD_PREFIX="" +CT_BUILD_SUFFIX="" + +# +# Misc options +# +# CT_TOOLCHAIN_ENABLE_NLS is not set +# end of Toolchain options + +# +# Operating System +# +CT_KERNEL_SUPPORTS_SHARED_LIBS=y +# CT_KERNEL_BARE_METAL is not set +CT_KERNEL_LINUX=y +CT_KERNEL="linux" +CT_KERNEL_CHOICE_KSYM="LINUX" +CT_KERNEL_LINUX_SHOW=y + +# +# Options for linux +# +CT_KERNEL_LINUX_PKG_KSYM="LINUX" +CT_LINUX_DIR_NAME="linux" +CT_LINUX_USE_WWW_KERNEL_ORG=y +# CT_LINUX_USE_ORACLE is not set +CT_LINUX_USE="LINUX" +CT_LINUX_PKG_NAME="linux" +CT_LINUX_SRC_RELEASE=y +# CT_LINUX_SRC_DEVEL is not set +CT_LINUX_PATCH_ORDER="global" +CT_LINUX_V_5_12=y +# CT_LINUX_V_5_11 is not set +# CT_LINUX_V_5_10 is not set +# CT_LINUX_V_5_9 is not set +# CT_LINUX_V_5_8 is not set +# CT_LINUX_V_5_7 is not set +# CT_LINUX_V_5_4 is not set +# CT_LINUX_V_5_3 is not set +# CT_LINUX_V_5_2 is not set +# CT_LINUX_V_5_1 is not set +# CT_LINUX_V_5_0 is not set +# CT_LINUX_V_4_20 is not set +# CT_LINUX_V_4_19 is not set +# CT_LINUX_V_4_18 is not set +# CT_LINUX_V_4_17 is not set +# CT_LINUX_V_4_16 is not set +# CT_LINUX_V_4_15 is not set +# CT_LINUX_V_4_14 is not set +# CT_LINUX_V_4_13 is not set +# CT_LINUX_V_4_12 is not set +# CT_LINUX_V_4_11 is not set +# CT_LINUX_V_4_10 is not set +# CT_LINUX_V_4_9 is not set +# CT_LINUX_V_4_4 is not set +# CT_LINUX_V_4_1 is not set +# CT_LINUX_V_3_16 is not set +# CT_LINUX_V_3_13 is not set +# CT_LINUX_V_3_12 is not set +# CT_LINUX_V_3_10 is not set +# CT_LINUX_V_3_4 is not set +# CT_LINUX_V_3_2 is not set +CT_LINUX_VERSION="5.12.12" +CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" +CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz" +CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign" +CT_LINUX_later_than_4_8=y +CT_LINUX_4_8_or_later=y +CT_LINUX_later_than_3_7=y +CT_LINUX_3_7_or_later=y +CT_LINUX_later_than_3_2=y +CT_LINUX_3_2_or_later=y +CT_LINUX_REQUIRE_3_2_or_later=y +CT_KERNEL_LINUX_VERBOSITY_0=y +# CT_KERNEL_LINUX_VERBOSITY_1 is not set +# CT_KERNEL_LINUX_VERBOSITY_2 is not set +CT_KERNEL_LINUX_VERBOSE_LEVEL=0 +CT_KERNEL_LINUX_INSTALL_CHECK=y +CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS" + +# +# Common kernel options +# +CT_SHARED_LIBS=y +# end of Operating System + +# +# Binary utilities +# +CT_ARCH_BINFMT_ELF=y +CT_BINUTILS_BINUTILS=y +CT_BINUTILS="binutils" +CT_BINUTILS_CHOICE_KSYM="BINUTILS" +CT_BINUTILS_BINUTILS_SHOW=y + +# +# Options for binutils +# +CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS" +CT_BINUTILS_DIR_NAME="binutils" +CT_BINUTILS_USE_GNU=y +# CT_BINUTILS_USE_ORACLE is not set +CT_BINUTILS_USE="BINUTILS" +CT_BINUTILS_PKG_NAME="binutils" +CT_BINUTILS_SRC_RELEASE=y +# CT_BINUTILS_SRC_DEVEL is not set +CT_BINUTILS_PATCH_ORDER="global" +CT_BINUTILS_V_2_36=y +# CT_BINUTILS_V_2_35 is not set +# CT_BINUTILS_V_2_34 is not set +# CT_BINUTILS_V_2_33 is not set +# CT_BINUTILS_V_2_32 is not set +# CT_BINUTILS_V_2_31 is not set +# CT_BINUTILS_V_2_30 is not set +# CT_BINUTILS_V_2_29 is not set +# CT_BINUTILS_V_2_28 is not set +# CT_BINUTILS_V_2_27 is not set +# CT_BINUTILS_V_2_26 is not set +CT_BINUTILS_VERSION="2.36.1" +CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" +CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" +CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_30=y +CT_BINUTILS_2_30_or_later=y +CT_BINUTILS_later_than_2_27=y +CT_BINUTILS_2_27_or_later=y +CT_BINUTILS_later_than_2_25=y +CT_BINUTILS_2_25_or_later=y +CT_BINUTILS_REQUIRE_2_25_or_later=y +CT_BINUTILS_later_than_2_23=y +CT_BINUTILS_2_23_or_later=y + +# +# GNU binutils +# +CT_BINUTILS_HAS_HASH_STYLE=y +CT_BINUTILS_HAS_GOLD=y +CT_BINUTILS_HAS_PLUGINS=y +CT_BINUTILS_HAS_PKGVERSION_BUGURL=y +CT_BINUTILS_GOLD_SUPPORTS_ARCH=y +CT_BINUTILS_GOLD_SUPPORT=y +CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y +# CT_BINUTILS_LINKER_LD is not set +CT_BINUTILS_LINKER_LD_GOLD=y +CT_BINUTILS_GOLD_INSTALLED=y +CT_BINUTILS_GOLD_THREADS=y +CT_BINUTILS_LINKER_BOTH=y +CT_BINUTILS_LINKERS_LIST="ld,gold" +CT_BINUTILS_LD_WRAPPER=y +CT_BINUTILS_LINKER_DEFAULT="bfd" +CT_BINUTILS_PLUGINS=y +CT_BINUTILS_RELRO=m +CT_BINUTILS_DETERMINISTIC_ARCHIVES=y +CT_BINUTILS_EXTRA_CONFIG_ARRAY="" +# CT_BINUTILS_FOR_TARGET is not set +CT_ALL_BINUTILS_CHOICES="BINUTILS" +# end of Binary utilities + +# +# C-library +# +CT_LIBC_GLIBC=y +# CT_LIBC_UCLIBC is not set +CT_LIBC="glibc" +CT_LIBC_CHOICE_KSYM="GLIBC" +CT_THREADS="nptl" +CT_LIBC_GLIBC_SHOW=y + +# +# Options for glibc +# +CT_LIBC_GLIBC_PKG_KSYM="GLIBC" +CT_GLIBC_DIR_NAME="glibc" +CT_GLIBC_USE_GNU=y +# CT_GLIBC_USE_ORACLE is not set +CT_GLIBC_USE="GLIBC" +CT_GLIBC_PKG_NAME="glibc" +CT_GLIBC_SRC_RELEASE=y +# CT_GLIBC_SRC_DEVEL is not set +CT_GLIBC_PATCH_ORDER="global" +CT_GLIBC_V_2_33=y +# CT_GLIBC_V_2_32 is not set +# CT_GLIBC_V_2_31 is not set +# CT_GLIBC_V_2_30 is not set +# CT_GLIBC_V_2_29 is not set +# CT_GLIBC_V_2_28 is not set +# CT_GLIBC_V_2_27 is not set +# CT_GLIBC_V_2_26 is not set +# CT_GLIBC_V_2_25 is not set +# CT_GLIBC_V_2_24 is not set +# CT_GLIBC_V_2_23 is not set +# CT_GLIBC_V_2_19 is not set +# CT_GLIBC_V_2_17 is not set +# CT_GLIBC_V_2_12_1 is not set +CT_GLIBC_VERSION="2.33" +CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" +CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" +CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" +CT_GLIBC_later_than_2_32=y +CT_GLIBC_2_32_or_later=y +CT_GLIBC_later_than_2_30=y +CT_GLIBC_2_30_or_later=y +CT_GLIBC_later_than_2_29=y +CT_GLIBC_2_29_or_later=y +CT_GLIBC_later_than_2_28=y +CT_GLIBC_2_28_or_later=y +CT_GLIBC_later_than_2_27=y +CT_GLIBC_2_27_or_later=y +CT_GLIBC_later_than_2_26=y +CT_GLIBC_2_26_or_later=y +CT_GLIBC_later_than_2_25=y +CT_GLIBC_2_25_or_later=y +CT_GLIBC_later_than_2_24=y +CT_GLIBC_2_24_or_later=y +CT_GLIBC_later_than_2_23=y +CT_GLIBC_2_23_or_later=y +CT_GLIBC_later_than_2_20=y +CT_GLIBC_2_20_or_later=y +CT_GLIBC_later_than_2_17=y +CT_GLIBC_2_17_or_later=y +CT_GLIBC_later_than_2_14=y +CT_GLIBC_2_14_or_later=y +CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y +CT_GLIBC_DEP_BINUTILS=y +CT_GLIBC_DEP_GCC=y +CT_GLIBC_DEP_PYTHON=y +CT_GLIBC_BUILD_SSP=y +CT_GLIBC_HAS_LIBIDN_ADDON=y +# CT_GLIBC_USE_LIBIDN_ADDON is not set +CT_GLIBC_NO_SPARC_V8=y +CT_GLIBC_EXTRA_CONFIG_ARRAY="" +CT_GLIBC_CONFIGPARMS="" +CT_GLIBC_EXTRA_CFLAGS="" +# CT_GLIBC_DISABLE_VERSIONING is not set +CT_GLIBC_OLDEST_ABI="" +CT_GLIBC_FORCE_UNWIND=y +# CT_GLIBC_LOCALES is not set +# CT_GLIBC_KERNEL_VERSION_NONE is not set +CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y +# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set +CT_GLIBC_MIN_KERNEL="5.12.12" +CT_GLIBC_SSP_DEFAULT=y +# CT_GLIBC_SSP_NO is not set +# CT_GLIBC_SSP_YES is not set +# CT_GLIBC_SSP_ALL is not set +# CT_GLIBC_SSP_STRONG is not set +# CT_GLIBC_ENABLE_WERROR is not set +CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" +CT_LIBC_SUPPORT_THREADS_ANY=y +CT_LIBC_SUPPORT_THREADS_NATIVE=y + +# +# Common C library options +# +CT_THREADS_NATIVE=y +# CT_CREATE_LDSO_CONF is not set +CT_LIBC_XLDD=y +# end of C-library + +# +# C compiler +# +CT_CC_CORE_PASSES_NEEDED=y +CT_CC_CORE_PASS_1_NEEDED=y +CT_CC_CORE_PASS_2_NEEDED=y +CT_CC_SUPPORT_CXX=y +CT_CC_SUPPORT_FORTRAN=y +CT_CC_SUPPORT_ADA=y +CT_CC_SUPPORT_OBJC=y +CT_CC_SUPPORT_OBJCXX=y +CT_CC_SUPPORT_GOLANG=y +CT_CC_GCC=y +CT_CC="gcc" +CT_CC_CHOICE_KSYM="GCC" +CT_CC_GCC_SHOW=y + +# +# Options for gcc +# +CT_CC_GCC_PKG_KSYM="GCC" +CT_GCC_DIR_NAME="gcc" +CT_GCC_USE_GNU=y +# CT_GCC_USE_ORACLE is not set +CT_GCC_USE="GCC" +CT_GCC_PKG_NAME="gcc" +CT_GCC_SRC_RELEASE=y +# CT_GCC_SRC_DEVEL is not set +CT_GCC_PATCH_ORDER="global" +CT_GCC_V_11=y +# CT_GCC_V_10 is not set +# CT_GCC_V_9 is not set +# CT_GCC_V_8 is not set +# CT_GCC_V_7 is not set +# CT_GCC_V_6 is not set +CT_GCC_VERSION="11.1.0" +CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" +CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" +CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_11=y +CT_GCC_11_or_later=y +CT_GCC_later_than_10=y +CT_GCC_10_or_later=y +CT_GCC_later_than_9=y +CT_GCC_9_or_later=y +CT_GCC_later_than_8=y +CT_GCC_8_or_later=y +CT_GCC_later_than_7=y +CT_GCC_7_or_later=y +CT_GCC_later_than_6=y +CT_GCC_6_or_later=y +CT_GCC_REQUIRE_6_or_later=y +CT_GCC_later_than_5=y +CT_GCC_5_or_later=y +CT_GCC_REQUIRE_5_or_later=y +CT_GCC_later_than_4_9=y +CT_GCC_4_9_or_later=y +CT_GCC_REQUIRE_4_9_or_later=y +CT_GCC_later_than_4_8=y +CT_GCC_4_8_or_later=y +CT_CC_GCC_ENABLE_PLUGINS=y +CT_CC_GCC_GOLD=y +CT_CC_GCC_HAS_LIBMPX=y +CT_CC_GCC_ENABLE_CXX_FLAGS="" +CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="" +CT_CC_GCC_EXTRA_CONFIG_ARRAY="" +CT_CC_GCC_STATIC_LIBSTDCXX=y +# CT_CC_GCC_SYSTEM_ZLIB is not set +CT_CC_GCC_CONFIG_TLS=m + +# +# Optimisation features +# +CT_CC_GCC_USE_GRAPHITE=y +CT_CC_GCC_USE_LTO=y + +# +# Settings for libraries running on target +# +CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y +CT_CC_GCC_LIBMUDFLAP=y +CT_CC_GCC_LIBGOMP=y +CT_CC_GCC_LIBSSP=m +CT_CC_GCC_LIBQUADMATH=y +CT_CC_GCC_LIBSANITIZER=y + +# +# Misc. obscure options. +# +CT_CC_CXA_ATEXIT=y +CT_CC_GCC_TM_CLONE_REGISTRY=m +CT_CC_GCC_DISABLE_PCH=y +CT_CC_GCC_SJLJ_EXCEPTIONS=m +CT_CC_GCC_LDBL_128=m +CT_CC_GCC_BUILD_ID=y +# CT_CC_GCC_LNK_HASH_STYLE_DEFAULT is not set +# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set +# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set +CT_CC_GCC_LNK_HASH_STYLE_BOTH=y +CT_CC_GCC_LNK_HASH_STYLE="both" +CT_CC_GCC_DEC_FLOATS_AUTO=y +# CT_CC_GCC_DEC_FLOATS_BID is not set +# CT_CC_GCC_DEC_FLOATS_DPD is not set +# CT_CC_GCC_DEC_FLOATS_NO is not set +CT_CC_GCC_DEC_FLOATS="" +CT_ALL_CC_CHOICES="GCC" + +# +# Additional supported languages: +# +CT_CC_LANG_CXX=y +CT_CC_LANG_FORTRAN=y +# end of C compiler + +# +# Debug facilities +# +# CT_DEBUG_DUMA is not set +CT_DEBUG_GDB=y +CT_DEBUG_GDB_PKG_KSYM="GDB" +CT_GDB_DIR_NAME="gdb" +CT_GDB_USE_GNU=y +CT_GDB_USE="GDB" +CT_GDB_PKG_NAME="gdb" +CT_GDB_SRC_RELEASE=y +# CT_GDB_SRC_DEVEL is not set +CT_GDB_PATCH_ORDER="global" +CT_GDB_V_9_2=y +# CT_GDB_V_8_3 is not set +# CT_GDB_V_8_2 is not set +# CT_GDB_V_8_1 is not set +# CT_GDB_V_8_0 is not set +# CT_GDB_V_7_12 is not set +# CT_GDB_V_7_11 is not set +CT_GDB_VERSION="9.2" +CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)" +CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz" +CT_GDB_SIGNATURE_FORMAT="" +CT_GDB_later_than_8_3=y +CT_GDB_8_3_or_later=y +CT_GDB_later_than_8_0=y +CT_GDB_8_0_or_later=y +CT_GDB_later_than_7_12=y +CT_GDB_7_12_or_later=y +CT_GDB_later_than_7_2=y +CT_GDB_7_2_or_later=y +CT_GDB_later_than_7_0=y +CT_GDB_7_0_or_later=y +CT_GDB_CROSS=y +# CT_GDB_CROSS_STATIC is not set +# CT_GDB_CROSS_SIM is not set +# CT_GDB_CROSS_PYTHON is not set +CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="" +# CT_GDB_NATIVE is not set +CT_GDB_GDBSERVER=y +# CT_GDB_NATIVE_BUILD_IPA_LIB is not set +# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set +CT_GDB_HAS_PKGVERSION_BUGURL=y +CT_GDB_HAS_PYTHON=y +CT_GDB_INSTALL_GDBINIT=y +CT_GDB_HAS_IPA_LIB=y +# CT_DEBUG_LTRACE is not set +# CT_DEBUG_STRACE is not set +CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" +# end of Debug facilities + +# +# Companion libraries +# +# CT_COMPLIBS_CHECK is not set +CT_COMP_LIBS_CLOOG=y +CT_COMP_LIBS_CLOOG_PKG_KSYM="CLOOG" +CT_CLOOG_DIR_NAME="cloog" +CT_CLOOG_PKG_NAME="cloog" +CT_CLOOG_SRC_RELEASE=y +# CT_CLOOG_SRC_DEVEL is not set +CT_CLOOG_PATCH_ORDER="global" +CT_CLOOG_V_0_18_4=y +CT_CLOOG_VERSION="0.18.4" +CT_CLOOG_MIRRORS="http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure" +CT_CLOOG_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_CLOOG_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_CLOOG_ARCHIVE_FORMATS=".tar.gz" +CT_CLOOG_SIGNATURE_FORMAT="" +CT_CLOOG_0_18_4_or_later=y +CT_CLOOG_0_18_4_or_older=y +CT_CLOOG_later_than_0_18_1=y +CT_CLOOG_0_18_1_or_later=y +CT_COMP_LIBS_EXPAT=y +CT_COMP_LIBS_EXPAT_PKG_KSYM="EXPAT" +CT_EXPAT_DIR_NAME="expat" +CT_EXPAT_PKG_NAME="expat" +CT_EXPAT_SRC_RELEASE=y +# CT_EXPAT_SRC_DEVEL is not set +CT_EXPAT_PATCH_ORDER="global" +CT_EXPAT_V_2_4=y +CT_EXPAT_VERSION="2.4.1" +CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}" +CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_EXPAT_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2 .tar.gz" +CT_EXPAT_SIGNATURE_FORMAT="" +CT_COMP_LIBS_GETTEXT=y +CT_COMP_LIBS_GETTEXT_PKG_KSYM="GETTEXT" +CT_GETTEXT_DIR_NAME="gettext" +CT_GETTEXT_PKG_NAME="gettext" +CT_GETTEXT_SRC_RELEASE=y +# CT_GETTEXT_SRC_DEVEL is not set +CT_GETTEXT_PATCH_ORDER="global" +CT_GETTEXT_V_0_20_1=y +# CT_GETTEXT_V_0_19_8_1 is not set +CT_GETTEXT_VERSION="0.20.1" +CT_GETTEXT_MIRRORS="$(CT_Mirrors GNU gettext)" +CT_GETTEXT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_GETTEXT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_GETTEXT_ARCHIVE_FORMATS=".tar.xz .tar.gz" +CT_GETTEXT_SIGNATURE_FORMAT="packed/.sig" +CT_COMP_LIBS_GMP=y +CT_COMP_LIBS_GMP_PKG_KSYM="GMP" +CT_GMP_DIR_NAME="gmp" +CT_GMP_PKG_NAME="gmp" +CT_GMP_SRC_RELEASE=y +# CT_GMP_SRC_DEVEL is not set +CT_GMP_PATCH_ORDER="global" +CT_GMP_V_6_2=y +# CT_GMP_V_6_1 is not set +CT_GMP_VERSION="6.2.1" +CT_GMP_MIRRORS="https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)" +CT_GMP_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_GMP_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_GMP_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2" +CT_GMP_SIGNATURE_FORMAT="packed/.sig" +CT_GMP_later_than_5_1_0=y +CT_GMP_5_1_0_or_later=y +CT_GMP_later_than_5_0_0=y +CT_GMP_5_0_0_or_later=y +CT_GMP_REQUIRE_5_0_0_or_later=y +CT_COMP_LIBS_ISL=y +CT_COMP_LIBS_ISL_PKG_KSYM="ISL" +CT_ISL_DIR_NAME="isl" +CT_ISL_PKG_NAME="isl" +CT_ISL_SRC_RELEASE=y +# CT_ISL_SRC_DEVEL is not set +CT_ISL_PATCH_ORDER="global" +CT_ISL_V_0_24=y +# CT_ISL_V_0_22 is not set +# CT_ISL_V_0_21 is not set +# CT_ISL_V_0_20 is not set +# CT_ISL_V_0_19 is not set +# CT_ISL_V_0_18 is not set +# CT_ISL_V_0_17 is not set +# CT_ISL_V_0_16 is not set +# CT_ISL_V_0_15 is not set +CT_ISL_VERSION="0.24" +CT_ISL_MIRRORS="http://isl.gforge.inria.fr" +CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" +CT_ISL_SIGNATURE_FORMAT="" +CT_ISL_later_than_0_18=y +CT_ISL_0_18_or_later=y +CT_ISL_later_than_0_15=y +CT_ISL_0_15_or_later=y +CT_ISL_REQUIRE_0_15_or_later=y +CT_ISL_later_than_0_14=y +CT_ISL_0_14_or_later=y +CT_ISL_REQUIRE_0_14_or_later=y +CT_ISL_later_than_0_13=y +CT_ISL_0_13_or_later=y +CT_ISL_later_than_0_12=y +CT_ISL_0_12_or_later=y +CT_ISL_REQUIRE_0_12_or_later=y +# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBICONV=y +CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" +CT_LIBICONV_DIR_NAME="libiconv" +CT_LIBICONV_PKG_NAME="libiconv" +CT_LIBICONV_SRC_RELEASE=y +# CT_LIBICONV_SRC_DEVEL is not set +CT_LIBICONV_PATCH_ORDER="global" +CT_LIBICONV_V_1_16=y +# CT_LIBICONV_V_1_15 is not set +CT_LIBICONV_VERSION="1.16" +CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)" +CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBICONV_ARCHIVE_FORMATS=".tar.gz" +CT_LIBICONV_SIGNATURE_FORMAT="packed/.sig" +CT_COMP_LIBS_MPC=y +CT_COMP_LIBS_MPC_PKG_KSYM="MPC" +CT_MPC_DIR_NAME="mpc" +CT_MPC_PKG_NAME="mpc" +CT_MPC_SRC_RELEASE=y +# CT_MPC_SRC_DEVEL is not set +CT_MPC_PATCH_ORDER="global" +CT_MPC_V_1_2=y +# CT_MPC_V_1_1 is not set +# CT_MPC_V_1_0 is not set +CT_MPC_VERSION="1.2.0" +CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_MPC_ARCHIVE_FORMATS=".tar.gz" +CT_MPC_SIGNATURE_FORMAT="packed/.sig" +CT_MPC_later_than_1_1_0=y +CT_MPC_1_1_0_or_later=y +CT_COMP_LIBS_MPFR=y +CT_COMP_LIBS_MPFR_PKG_KSYM="MPFR" +CT_MPFR_DIR_NAME="mpfr" +CT_MPFR_PKG_NAME="mpfr" +CT_MPFR_SRC_RELEASE=y +# CT_MPFR_SRC_DEVEL is not set +CT_MPFR_PATCH_ORDER="global" +CT_MPFR_V_4_1=y +# CT_MPFR_V_4_0 is not set +# CT_MPFR_V_3_1 is not set +CT_MPFR_VERSION="4.1.0" +CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" +CT_MPFR_SIGNATURE_FORMAT="packed/.asc" +CT_MPFR_later_than_4_0_0=y +CT_MPFR_4_0_0_or_later=y +CT_MPFR_later_than_3_0_0=y +CT_MPFR_3_0_0_or_later=y +CT_MPFR_REQUIRE_3_0_0_or_later=y +CT_COMP_LIBS_NCURSES=y +CT_COMP_LIBS_NCURSES_PKG_KSYM="NCURSES" +CT_NCURSES_DIR_NAME="ncurses" +CT_NCURSES_PKG_NAME="ncurses" +CT_NCURSES_SRC_RELEASE=y +# CT_NCURSES_SRC_DEVEL is not set +CT_NCURSES_PATCH_ORDER="global" +CT_NCURSES_V_6_2=y +# CT_NCURSES_V_6_1 is not set +# CT_NCURSES_V_6_0 is not set +CT_NCURSES_VERSION="6.2" +CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)" +CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_NCURSES_ARCHIVE_FORMATS=".tar.gz" +CT_NCURSES_SIGNATURE_FORMAT="packed/.sig" +CT_NCURSES_HOST_CONFIG_ARGS="" +CT_NCURSES_HOST_DISABLE_DB=y +CT_NCURSES_HOST_FALLBACKS="linux,xterm,xterm-color,xterm-256color,vt100" +CT_NCURSES_TARGET_CONFIG_ARGS="" +# CT_NCURSES_TARGET_DISABLE_DB is not set +CT_NCURSES_TARGET_FALLBACKS="" +CT_COMP_LIBS_ZLIB=y +CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB" +CT_ZLIB_DIR_NAME="zlib" +CT_ZLIB_PKG_NAME="zlib" +CT_ZLIB_SRC_RELEASE=y +# CT_ZLIB_SRC_DEVEL is not set +CT_ZLIB_PATCH_ORDER="global" +CT_ZLIB_V_1_2_11=y +CT_ZLIB_VERSION="1.2.11" +CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" +CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" +CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_LIBICONV_NEEDED=y +CT_GETTEXT_NEEDED=y +CT_GMP_NEEDED=y +CT_MPFR_NEEDED=y +CT_ISL_NEEDED=y +CT_MPC_NEEDED=y +CT_EXPAT_NEEDED=y +CT_NCURSES_NEEDED=y +CT_ZLIB_NEEDED=y +CT_LIBICONV=y +CT_GETTEXT=y +CT_GMP=y +CT_MPFR=y +CT_ISL=y +CT_MPC=y +CT_EXPAT=y +CT_NCURSES=y +CT_ZLIB=y +# end of Companion libraries + +# +# Companion tools +# +# CT_COMP_TOOLS_FOR_HOST is not set +# CT_COMP_TOOLS_AUTOCONF is not set +# CT_COMP_TOOLS_AUTOMAKE is not set +# CT_COMP_TOOLS_BISON is not set +# CT_COMP_TOOLS_DTC is not set +# CT_COMP_TOOLS_LIBTOOL is not set +# CT_COMP_TOOLS_M4 is not set +# CT_COMP_TOOLS_MAKE is not set +CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE" +# end of Companion tools From 2886400450cc72ec2bffb4d548076e5149e2cc5c Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 5 Aug 2021 16:33:43 +0200 Subject: [PATCH 22/27] Down glibc to 2.28 and min kernel to 4.19, update GCC to 11.2.0 Down glibc to 2.28 and min kernel to 4.19, update GCC to 11.2.0 Signed-off-by: Bensuperpc --- linux-armv6-lts/crosstool-ng.config | 47 +++++++++++++++++------------ 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/linux-armv6-lts/crosstool-ng.config b/linux-armv6-lts/crosstool-ng.config index 0b5e548..14fcbda 100644 --- a/linux-armv6-lts/crosstool-ng.config +++ b/linux-armv6-lts/crosstool-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.24.0.385_9e10cb6 Configuration +# crosstool-NG 1.24.0.409_d47b234 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.24.0.385_9e10cb6" +CT_VERSION="1.24.0.409_d47b234" CT_VCHECK="" CT_CONFIG_VERSION_ENV="3" CT_CONFIG_VERSION_CURRENT="3" @@ -99,6 +99,7 @@ CT_PARALLEL_JOBS=4 CT_LOAD="" CT_USE_PIPES=y CT_EXTRA_CFLAGS_FOR_BUILD="" +CT_EXTRA_CXXFLAGS_FOR_BUILD="" CT_EXTRA_LDFLAGS_FOR_BUILD="" CT_EXTRA_CFLAGS_FOR_HOST="" CT_EXTRA_LDFLAGS_FOR_HOST="" @@ -269,7 +270,8 @@ CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y # CT_LINUX_SRC_DEVEL is not set CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_12=y +CT_LINUX_V_5_13=y +# CT_LINUX_V_5_12 is not set # CT_LINUX_V_5_11 is not set # CT_LINUX_V_5_10 is not set # CT_LINUX_V_5_9 is not set @@ -300,7 +302,7 @@ CT_LINUX_V_5_12=y # CT_LINUX_V_3_10 is not set # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set -CT_LINUX_VERSION="5.12.12" +CT_LINUX_VERSION="5.13.1" CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -422,12 +424,12 @@ CT_GLIBC_PKG_NAME="glibc" CT_GLIBC_SRC_RELEASE=y # CT_GLIBC_SRC_DEVEL is not set CT_GLIBC_PATCH_ORDER="global" -CT_GLIBC_V_2_33=y +# CT_GLIBC_V_2_33 is not set # CT_GLIBC_V_2_32 is not set # CT_GLIBC_V_2_31 is not set # CT_GLIBC_V_2_30 is not set # CT_GLIBC_V_2_29 is not set -# CT_GLIBC_V_2_28 is not set +CT_GLIBC_V_2_28=y # CT_GLIBC_V_2_27 is not set # CT_GLIBC_V_2_26 is not set # CT_GLIBC_V_2_25 is not set @@ -436,20 +438,20 @@ CT_GLIBC_V_2_33=y # CT_GLIBC_V_2_19 is not set # CT_GLIBC_V_2_17 is not set # CT_GLIBC_V_2_12_1 is not set -CT_GLIBC_VERSION="2.33" +CT_GLIBC_VERSION="2.28" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" -CT_GLIBC_later_than_2_32=y -CT_GLIBC_2_32_or_later=y -CT_GLIBC_later_than_2_30=y -CT_GLIBC_2_30_or_later=y -CT_GLIBC_later_than_2_29=y -CT_GLIBC_2_29_or_later=y -CT_GLIBC_later_than_2_28=y +CT_GLIBC_2_32_or_older=y +CT_GLIBC_older_than_2_32=y +CT_GLIBC_2_30_or_older=y +CT_GLIBC_older_than_2_30=y +CT_GLIBC_2_29_or_older=y +CT_GLIBC_older_than_2_29=y CT_GLIBC_2_28_or_later=y +CT_GLIBC_2_28_or_older=y CT_GLIBC_later_than_2_27=y CT_GLIBC_2_27_or_later=y CT_GLIBC_later_than_2_26=y @@ -470,27 +472,32 @@ CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y CT_GLIBC_DEP_BINUTILS=y CT_GLIBC_DEP_GCC=y CT_GLIBC_DEP_PYTHON=y +CT_GLIBC_SPARC_ALLOW_V7=y CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y +CT_GLIBC_HAS_OBSOLETE_RPC=y CT_GLIBC_EXTRA_CONFIG_ARRAY="" CT_GLIBC_CONFIGPARMS="" CT_GLIBC_EXTRA_CFLAGS="" +CT_GLIBC_ENABLE_OBSOLETE_RPC=y # CT_GLIBC_DISABLE_VERSIONING is not set CT_GLIBC_OLDEST_ABI="" CT_GLIBC_FORCE_UNWIND=y # CT_GLIBC_LOCALES is not set # CT_GLIBC_KERNEL_VERSION_NONE is not set -CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y -# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set -CT_GLIBC_MIN_KERNEL="5.12.12" +# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set +CT_GLIBC_KERNEL_VERSION_CHOSEN=y +CT_GLIBC_MIN_KERNEL_VERSION="4.19.0" +CT_GLIBC_MIN_KERNEL="4.19.0" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set # CT_GLIBC_SSP_ALL is not set # CT_GLIBC_SSP_STRONG is not set # CT_GLIBC_ENABLE_WERROR is not set +# CT_GLIBC_ENABLE_COMMON_FLAG is not set CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -538,7 +545,9 @@ CT_GCC_V_11=y # CT_GCC_V_8 is not set # CT_GCC_V_7 is not set # CT_GCC_V_6 is not set -CT_GCC_VERSION="11.1.0" +# CT_GCC_V_5 is not set +# CT_GCC_V_4_9 is not set +CT_GCC_VERSION="11.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -556,10 +565,8 @@ CT_GCC_later_than_7=y CT_GCC_7_or_later=y CT_GCC_later_than_6=y CT_GCC_6_or_later=y -CT_GCC_REQUIRE_6_or_later=y CT_GCC_later_than_5=y CT_GCC_5_or_later=y -CT_GCC_REQUIRE_5_or_later=y CT_GCC_later_than_4_9=y CT_GCC_4_9_or_later=y CT_GCC_REQUIRE_4_9_or_later=y From 54f73cbb6598d31a8d4a2e6566fa241c5c234e09 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 5 Aug 2021 19:06:40 +0200 Subject: [PATCH 23/27] remove manylinux2010 and manylinux1 images remove manylinux2010 and manylinux1 images Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 +- Makefile | 85 ++----------------------------- README.md | 48 ----------------- common/common.docker | 2 +- manylinux1-x64/Dockerfile.in | 28 ---------- manylinux1-x64/Toolchain.cmake | 11 ---- manylinux1-x86/Dockerfile.in | 31 ----------- manylinux1-x86/Toolchain.cmake | 15 ------ manylinux2010-x64/Dockerfile.in | 32 ------------ manylinux2010-x64/Toolchain.cmake | 11 ---- manylinux2010-x86/Dockerfile.in | 35 ------------- manylinux2010-x86/Toolchain.cmake | 11 ---- 12 files changed, 5 insertions(+), 306 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 delete mode 100644 manylinux2010-x64/Dockerfile.in delete mode 100644 manylinux2010-x64/Toolchain.cmake delete mode 100644 manylinux2010-x86/Dockerfile.in delete mode 100644 manylinux2010-x86/Toolchain.cmake diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2799ce6..5c28189 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-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, linux-riscv64, linux-riscv32, linux-m68k-uclibc] + arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, 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, linux-riscv64, linux-riscv32, linux-m68k-uclibc] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 diff --git a/Makefile b/Makefile index 8b48621..5b91099 100644 --- a/Makefile +++ b/Makefile @@ -9,19 +9,19 @@ 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-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-riscv64 linux-riscv32 linux-m68k-uclibc # Generated Dockerfiles. -GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl 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-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc +GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl 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-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc 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 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 +NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 # Docker composite files DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env @@ -158,85 +158,6 @@ manylinux2014-x86.test: manylinux2014-x86 $(DOCKER) run $(RM) $(ORG)/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 -# -# manylinux2010-x64 -# - -manylinux2010-x64: manylinux2010-x64/Dockerfile - mkdir -p $@/imagefiles && cp -r imagefiles $@/ - $(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \ - -t $(ORG)/manylinux2010-x64:$(TAG) \ - --build-arg IMAGE=$(ORG)/manylinux2010-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 manylinux2010-x64/Dockerfile . - rm -rf $@/imagefiles - -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/cp38-cp38/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 \ - -t $(ORG)/manylinux2010-x86:$(TAG) \ - --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 . - rm -rf $@/imagefiles - -manylinux2010-x86.test: manylinux2010-x86 - $(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86 - $(BIN)/dockcross-manylinux2010-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 \ - -t $(ORG)/manylinux1-x64:$(TAG) \ - --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 . - rm -rf $@/imagefiles - -manylinux1-x64.test: manylinux1-x64 - $(DOCKER) run $(RM) $(ORG)/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 \ - -t $(ORG)/manylinux1-x86:$(TAG) \ - --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 . - rm -rf $@/imagefiles - -manylinux1-x86.test: manylinux1-x86 - $(DOCKER) run $(RM) $(ORG)/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 -# base: Dockerfile imagefiles/ $(DOCKER) build -t $(ORG)/base:latest \ diff --git a/README.md b/README.md index 5001661..fd8a016 100644 --- a/README.md +++ b/README.md @@ -280,54 +280,6 @@ has installations of CMake, Ninja, and [scikit-build](http://scikit-build.org). For CMake, it sets [MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain. -### dockcross/manylinux2010-x64 - -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2010-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2010-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2010-x64) - -Docker [manylinux2010](https://github.com/pypa/manylinux) -image for building Linux x86_64 / amd64 [Python wheel -packages](http://pythonwheels.com/). It includes Python 2.7, 3.4, -3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script, -and it has installations of CMake, Ninja, and -[scikit-build](http://scikit-build.org). For CMake, it sets -[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain. - -### dockcross/manylinux2010-x86 - -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2010-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2010-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2010-x86) - -Docker [manylinux2010](https://github.com/pypa/manylinux) image for -building Linux i686 [Python wheel -packages](http://pythonwheels.com/). It includes Python 2.7, 3.4, -3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script, -and it has installations of CMake, Ninja, and -[scikit-build](http://scikit-build.org). For CMake, it sets -[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain. - -### dockcross/manylinux1-x64 - -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux1-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux1-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux1-x64) - -Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1) -image for building Linux x86_64 / amd64 [Python wheel -packages](http://pythonwheels.com/). It includes Python 2.7, 3.4, -3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script, -and it has installations of CMake, Ninja, and -[scikit-build](http://scikit-build.org). For CMake, it sets -[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain. - -### dockcross/manylinux1-x86 - -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux1-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux1-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux1-x86) - -Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1) -image for building Linux i686 [Python wheel -packages](http://pythonwheels.com/). It includes Python 2.7, 3.4, -3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script, -and it has installations of CMake, Ninja, and -[scikit-build](http://scikit-build.org). For CMake, it sets -[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain. - ### dockcross/web-wasm ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/web-wasm/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/web-wasm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/web-wasm) diff --git a/common/common.docker b/common/common.docker index 7ef8a72..02a98a2 100644 --- a/common/common.docker +++ b/common/common.docker @@ -18,7 +18,7 @@ COPY \ /buildscripts/ RUN \ - X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux1-x86" -o "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2010-x86" -o "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \ + X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \ /buildscripts/build-and-install-openssl.sh $X86_FLAG && \ /buildscripts/build-and-install-openssh.sh && \ /buildscripts/build-and-install-curl.sh && \ diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in deleted file mode 100644 index 8d57eb4..0000000 --- a/manylinux1-x64/Dockerfile.in +++ /dev/null @@ -1,28 +0,0 @@ -FROM quay.io/pypa/manylinux1_x86_64:latest -MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - -ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64 -ENV CMAKE_BIN true - -#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 3ba63be..0000000 --- a/manylinux1-x86/Dockerfile.in +++ /dev/null @@ -1,31 +0,0 @@ -FROM quay.io/pypa/manylinux1_i686:latest -MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - -ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86 -ENV CMAKE_BIN true - -#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/) diff --git a/manylinux2010-x64/Dockerfile.in b/manylinux2010-x64/Dockerfile.in deleted file mode 100644 index 1a6d820..0000000 --- a/manylinux2010-x64/Dockerfile.in +++ /dev/null @@ -1,32 +0,0 @@ -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" diff --git a/manylinux2010-x64/Toolchain.cmake b/manylinux2010-x64/Toolchain.cmake deleted file mode 100644 index 7a982de..0000000 --- a/manylinux2010-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(MANYLINUX2010 TRUE) - -set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) -set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gfortran) diff --git a/manylinux2010-x86/Dockerfile.in b/manylinux2010-x86/Dockerfile.in deleted file mode 100644 index cca1248..0000000 --- a/manylinux2010-x86/Dockerfile.in +++ /dev/null @@ -1,35 +0,0 @@ -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.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 i686-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-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"] - -#include "common.label-and-env" diff --git a/manylinux2010-x86/Toolchain.cmake b/manylinux2010-x86/Toolchain.cmake deleted file mode 100644 index 54230bb..0000000 --- a/manylinux2010-x86/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 i686) - -set(MANYLINUX2010 TRUE) - -set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) -set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gfortran) From 501b1b84dccf6bbce45d991992cc54b31e0703ec Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 6 Aug 2021 01:17:47 +0200 Subject: [PATCH 24/27] Improve curl with retry on error Improve curl with retry on error Signed-off-by: Bensuperpc --- imagefiles/build-and-install-curl.sh | 8 +++++++- imagefiles/build-and-install-git.sh | 7 ++++++- imagefiles/build-and-install-ninja.sh | 8 +++++++- imagefiles/build-and-install-openssh.sh | 8 +++++++- imagefiles/build-and-install-openssl.sh | 16 ++++++++++++++-- imagefiles/install-cmake-binary.sh | 7 ++++++- imagefiles/install-gosu-binary.sh | 14 ++++++++++++-- 7 files changed, 59 insertions(+), 9 deletions(-) diff --git a/imagefiles/build-and-install-curl.sh b/imagefiles/build-and-install-curl.sh index bb347ad..54f14f9 100755 --- a/imagefiles/build-and-install-curl.sh +++ b/imagefiles/build-and-install-curl.sh @@ -29,7 +29,13 @@ function build_curl { local curl_sha256=$2 check_var ${curl_sha256} check_var ${CURL_DOWNLOAD_URL} - curl -fsSLO ${CURL_DOWNLOAD_URL}/${curl_fname}.tar.gz + curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -fsSLO ${CURL_DOWNLOAD_URL}/${curl_fname}.tar.gz + check_sha256sum ${curl_fname}.tar.gz ${curl_sha256} tar -zxf ${curl_fname}.tar.gz (cd curl-*/ && do_curl_build) diff --git a/imagefiles/build-and-install-git.sh b/imagefiles/build-and-install-git.sh index 9d1f249..b6237ef 100755 --- a/imagefiles/build-and-install-git.sh +++ b/imagefiles/build-and-install-git.sh @@ -25,7 +25,12 @@ cd /usr/src url="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz" echo "Downloading $url" -curl -# -LO $url +curl --connect-timeout 20 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 40 \ + -# -LO $url tar xvzf git-${GIT_VERSION}.tar.gz --no-same-owner rm -f git-${GIT_VERSION}.tar.gz diff --git a/imagefiles/build-and-install-ninja.sh b/imagefiles/build-and-install-ninja.sh index a2789dc..be337e3 100755 --- a/imagefiles/build-and-install-ninja.sh +++ b/imagefiles/build-and-install-ninja.sh @@ -27,7 +27,13 @@ done # Download REV=v1.10.2 -curl -# -o ninja.tar.gz -LO https://github.com/ninja-build/ninja/archive/$REV.tar.gz +curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -# -o ninja.tar.gz -LO https://github.com/ninja-build/ninja/archive/$REV.tar.gz + mkdir ninja tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja diff --git a/imagefiles/build-and-install-openssh.sh b/imagefiles/build-and-install-openssh.sh index a8b1d9a..4e1a4fa 100755 --- a/imagefiles/build-and-install-openssh.sh +++ b/imagefiles/build-and-install-openssh.sh @@ -5,7 +5,13 @@ set -ex OPENSSH_ROOT=V_8_5_P1 cd /usr/src -curl -LO https://github.com/openssh/openssh-portable/archive/${OPENSSH_ROOT}.tar.gz +curl --connect-timeout 20 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 40 \ + -LO https://github.com/openssh/openssh-portable/archive/${OPENSSH_ROOT}.tar.gz + tar -xvf ${OPENSSH_ROOT}.tar.gz rm -f ${OPENSSH_ROOT}.tar.gz diff --git a/imagefiles/build-and-install-openssl.sh b/imagefiles/build-and-install-openssl.sh index 19a6610..cc5f7b8 100755 --- a/imagefiles/build-and-install-openssl.sh +++ b/imagefiles/build-and-install-openssl.sh @@ -69,7 +69,13 @@ function build_perl { local perl_sha256=$2 check_var ${perl_sha256} check_var ${PERL_DOWNLOAD_URL} - curl -fsSLO ${PERL_DOWNLOAD_URL}/${perl_fname}.tar.gz + curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -fsSLO ${PERL_DOWNLOAD_URL}/${perl_fname}.tar.gz + check_sha256sum ${perl_fname}.tar.gz ${perl_sha256} tar -xzf ${perl_fname}.tar.gz (cd ${perl_fname} && do_perl_build) @@ -88,7 +94,13 @@ function build_openssl { local openssl_sha256=$2 check_var ${openssl_sha256} check_var ${OPENSSL_DOWNLOAD_URL} - curl -fsSLO ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz + curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -fsSLO ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz + check_sha256sum ${openssl_fname}.tar.gz ${openssl_sha256} tar -xzf ${openssl_fname}.tar.gz (cd ${openssl_fname} && PATH=/opt/perl/bin:${PATH} do_openssl_build) diff --git a/imagefiles/install-cmake-binary.sh b/imagefiles/install-cmake-binary.sh index 9c34087..2e9fb92 100755 --- a/imagefiles/install-cmake-binary.sh +++ b/imagefiles/install-cmake-binary.sh @@ -38,7 +38,12 @@ cd /usr/src CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH} url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz echo "Downloading $url" -curl -# -LO $url +curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -# -LO $url tar -xzvf ${CMAKE_ROOT}.tar.gz rm -f ${CMAKE_ROOT}.tar.gz diff --git a/imagefiles/install-gosu-binary.sh b/imagefiles/install-gosu-binary.sh index 2668036..2eb082e 100755 --- a/imagefiles/install-gosu-binary.sh +++ b/imagefiles/install-gosu-binary.sh @@ -26,10 +26,20 @@ gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD40 gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 echo "Downloading $url" -curl -o /usr/local/bin/gosu -# -SL $url +curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -o /usr/local/bin/gosu -# -SL $url echo "Downloading $url_key" -curl -o /usr/local/bin/gosu.asc -# -SL $url_key +curl --connect-timeout 30 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 10 \ + --retry-max-time 30 \ + -o /usr/local/bin/gosu.asc -# -SL $url_key gpg --verify /usr/local/bin/gosu.asc From d0e3fe912c730b5ea80aff2f75ccd85af028c50d Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 6 Aug 2021 14:03:00 +0200 Subject: [PATCH 25/27] Break arch_name in multiple lines Break arch_name in multiple lines Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a535b5..d01803b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,16 @@ jobs: strategy: fail-fast: false matrix: - arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, 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, linux-riscv64, linux-riscv32, linux-m68k-uclibc] + arch_name: [android-arm, android-arm64, android-x86, android-x86_64, + linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, + linux-armv6, linux-armv6-lts, linux-armv6-musl, + linux-armv7, linux-armv7a, linux-armv7l-musl, + linux-x64-clang, linux-s390x, linux-x64, linux-x86, + linux-mips, linux-ppc64le, web-wasm, + 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, + linux-riscv64, linux-riscv32, linux-m68k-uclibc] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 From 7ec0eaa3c9875f2216fba11529327309c034c4fa Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 6 Aug 2021 20:23:31 +0200 Subject: [PATCH 26/27] Add linux-armv6-lts in Readme Add linux-armv6-lts in Readme Signed-off-by: Bensuperpc --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd8a016..a5bbfab 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,13 @@ Linux armv5 cross compiler toolchain using ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6) -Linux ARMv6 cross compiler toolchain for the Raspberry Pi, etc. +Linux ARMv6 cross compiler toolchain for the Raspberry Pi + +### dockcross/linux-armv6-lts + +![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-lts/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6-lts/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-lts) + +Linux ARMv6 cross compiler toolchain for the Raspberry Pi (Debian buster...) ### dockcross/linux-armv6-musl From 3bc9f001d2b5ee781804fc8af8c043201fe589f6 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 6 Aug 2021 23:03:33 +0200 Subject: [PATCH 27/27] Update GCC to 11.2.0 and Linux to 5.13.1 Update GCC to 11.2.0 and Linux to 5.13.1 Signed-off-by: Bensuperpc --- linux-xtensa-uclibc/crosstool-ng.config | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/linux-xtensa-uclibc/crosstool-ng.config b/linux-xtensa-uclibc/crosstool-ng.config index 18406c1..ae69466 100644 --- a/linux-xtensa-uclibc/crosstool-ng.config +++ b/linux-xtensa-uclibc/crosstool-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.24.0.385_9e10cb6 Configuration +# crosstool-NG 1.24.0.409_d47b234 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.24.0.385_9e10cb6" +CT_VERSION="1.24.0.409_d47b234" CT_VCHECK="" CT_CONFIG_VERSION_ENV="3" CT_CONFIG_VERSION_CURRENT="3" @@ -99,6 +99,7 @@ CT_PARALLEL_JOBS=0 CT_LOAD="" CT_USE_PIPES=y CT_EXTRA_CFLAGS_FOR_BUILD="" +CT_EXTRA_CXXFLAGS_FOR_BUILD="" CT_EXTRA_LDFLAGS_FOR_BUILD="" CT_EXTRA_CFLAGS_FOR_HOST="" CT_EXTRA_LDFLAGS_FOR_HOST="" @@ -247,7 +248,8 @@ CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y # CT_LINUX_SRC_DEVEL is not set CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_12=y +CT_LINUX_V_5_13=y +# CT_LINUX_V_5_12 is not set # CT_LINUX_V_5_11 is not set # CT_LINUX_V_5_10 is not set # CT_LINUX_V_5_9 is not set @@ -279,7 +281,7 @@ CT_LINUX_V_5_12=y # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set # CT_LINUX_V_2_6_32 is not set -CT_LINUX_VERSION="5.12.12" +CT_LINUX_VERSION="5.13.1" CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -492,7 +494,7 @@ CT_GCC_V_11=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="11.1.0" +CT_GCC_VERSION="11.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"