mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-18 00:49:25 +02:00
Compare commits
17 Commits
disable_ma
...
uptate_cma
| Author | SHA1 | Date | |
|---|---|---|---|
| e5ed0f45e6 | |||
| d2fb4755f0 | |||
| ea2c1635ff | |||
| 76d1ec682f | |||
| cc949d6a85 | |||
| e25f67aea9 | |||
| aa4bcf4a34 | |||
| 7ec0eaa3c9 | |||
| 09e8f01e94 | |||
| d0e3fe912c | |||
| 3802117f88 | |||
| 97c3a4a4f6 | |||
| d30a795408 | |||
| afd21c490e | |||
| a38a7920ac | |||
| 55138d52e0 | |||
| 4fd8fb9e09 |
11
.github/workflows/main.yml
vendored
11
.github/workflows/main.yml
vendored
@ -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
|
||||
|
||||
48
Makefile
48
Makefile
@ -13,18 +13,36 @@ 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 linux-armv6-lts
|
||||
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-m68k-uclibc linux-s390x \
|
||||
linux-armv6 linux-armv6-lts linux-armv6-musl \
|
||||
linux-armv7l-musl linux-armv7 linux-armv7a \
|
||||
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
|
||||
|
||||
# Generated Dockerfiles.
|
||||
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 linux-armv6-lts
|
||||
GEN_IMAGES = android-arm android-arm64 \
|
||||
linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \
|
||||
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-lts 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))
|
||||
|
||||
# These images are expected to have explicit rules for *both* build and testing
|
||||
NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
|
||||
NON_STANDARD_IMAGES = manylinux2014-x64 manylinux2014-x86 \
|
||||
manylinux2014-aarch64 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))
|
||||
|
||||
@ -32,7 +50,7 @@ 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"
|
||||
windows-static-x64-posix.test_ARGS = --exe-suffix ".exe"
|
||||
@ -119,7 +137,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
|
||||
|
||||
#
|
||||
@ -137,7 +156,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
|
||||
|
||||
#
|
||||
@ -155,10 +175,10 @@ 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
|
||||
|
||||
|
||||
base: Dockerfile imagefiles/
|
||||
$(DOCKER) build -t $(ORG)/base:latest \
|
||||
-t $(ORG)/base:$(TAG) \
|
||||
@ -192,13 +212,14 @@ $(STANDARD_IMAGES): %: %/Dockerfile base
|
||||
rm -rf $@/imagefiles
|
||||
|
||||
clean:
|
||||
for d in $(STANDARD_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
|
||||
|
||||
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
|
||||
|
||||
@ -212,7 +233,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)
|
||||
|
||||
#
|
||||
@ -223,4 +245,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
|
||||
|
||||
@ -149,7 +149,13 @@ Linux armv5 cross compiler toolchain using
|
||||
|
||||
  
|
||||
|
||||
Linux ARMv6 cross compiler toolchain for the Raspberry Pi, etc.
|
||||
Linux ARMv6 cross compiler toolchain for the Raspberry Pi
|
||||
|
||||
### dockcross/linux-armv6-lts
|
||||
|
||||
  
|
||||
|
||||
Linux ARMv6 cross compiler toolchain for the Raspberry Pi (Debian buster...)
|
||||
|
||||
### dockcross/linux-armv6-musl
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel lib
|
||||
|
||||
ENV PYTHON_COMPILE_DEPS="python-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"
|
||||
|
||||
ENV TOOLCHAIN_DEPS="devtoolset-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran"
|
||||
ENV TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran"
|
||||
|
||||
# Install dependent packages required for `ct-ng`.
|
||||
RUN \
|
||||
@ -62,7 +62,7 @@ RUN \
|
||||
rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
|
||||
# Remove sudo provided by devtoolset since it doesn't work with
|
||||
# our sudo wrapper calling gosu.
|
||||
rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo
|
||||
rm -f /opt/rh/devtoolset-10/root/usr/bin/sudo
|
||||
|
||||
# Restore our default workdir (from "dockcross/base").
|
||||
WORKDIR /work
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
WORKDIR /usr/src
|
||||
|
||||
ARG GIT_VERSION=2.32.0
|
||||
ARG CMAKE_VERSION=3.20.5
|
||||
ARG CMAKE_VERSION=3.21.1
|
||||
|
||||
# Image build scripts
|
||||
COPY \
|
||||
|
||||
@ -23,6 +23,7 @@ RUN \
|
||||
rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \
|
||||
rm -f /opt/rh/devtoolset-8/root/usr/bin/sudo && \
|
||||
rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo && \
|
||||
rm -f /opt/rh/devtoolset-10/root/usr/bin/sudo && \
|
||||
/buildscripts/install-python-packages.sh && \
|
||||
rm -rf /buildscripts
|
||||
|
||||
|
||||
@ -4,6 +4,9 @@ set -ex
|
||||
|
||||
WRAPPER=""
|
||||
|
||||
CMAKE_URL="https://gitlab.kitware.com/cmake/cmake.git"
|
||||
CMAKE_MIRROR_URL="https://github.com/Kitware/CMake.git"
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
-32)
|
||||
@ -29,7 +32,9 @@ fi
|
||||
|
||||
cd /usr/src
|
||||
|
||||
git clone https://gitlab.kitware.com/cmake/cmake.git CMake -b v$CMAKE_VERSION --depth 1
|
||||
# If the first link doesn't work, it will use the mirror on github
|
||||
git clone "$CMAKE_URL" CMake -b v$CMAKE_VERSION --depth 1 \
|
||||
|| git clone "$CMAKE_MIRROR_URL" CMake -b v$CMAKE_VERSION --depth 1
|
||||
|
||||
mkdir /usr/src/CMake-build
|
||||
cd /usr/src/CMake-build
|
||||
|
||||
@ -16,7 +16,7 @@ RUN echo $'#!/bin/bash\n\
|
||||
LD_PRELOAD=/usr/lib64/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
|
||||
|
||||
ENV CROSS_TRIPLE x86_64-linux-gnu
|
||||
ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin
|
||||
ENV CROSS_ROOT /opt/rh/devtoolset-10/root/usr/bin
|
||||
ENV AS=${CROSS_ROOT}/as \
|
||||
AR=${CROSS_ROOT}/ar \
|
||||
CC=${CROSS_ROOT}/gcc \
|
||||
|
||||
@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||
|
||||
set(MANYLINUX2014 TRUE)
|
||||
|
||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
|
||||
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++)
|
||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
|
||||
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
|
||||
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
|
||||
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)
|
||||
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gfortran)
|
||||
|
||||
@ -16,7 +16,7 @@ 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-9/root/usr/bin
|
||||
ENV CROSS_ROOT /opt/rh/devtoolset-10/root/usr/bin
|
||||
ENV AS=${CROSS_ROOT}/as \
|
||||
AR=${CROSS_ROOT}/ar \
|
||||
CC=${CROSS_ROOT}/gcc \
|
||||
|
||||
@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||
|
||||
set(MANYLINUX2014 TRUE)
|
||||
|
||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
|
||||
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++)
|
||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
|
||||
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
|
||||
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
|
||||
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)
|
||||
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gfortran)
|
||||
|
||||
Reference in New Issue
Block a user