mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-23 11:23:33 +02:00
Update linux-arm64-full
Update buildroot to 2025.05 (from 2021.09.20) Improve build speed (remove unused apps and libs) Update scripts Update tests Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
24
Makefile
24
Makefile
@ -35,6 +35,8 @@ HOST_ARCH := $(or $(HOST_ARCH), $(shell uname -m | sed -e 's/x86_64/amd64/' -e '
|
||||
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
|
||||
BIN = ./bin
|
||||
|
||||
RM = --rm
|
||||
|
||||
# These images are built using the "build implicit rule"
|
||||
STANDARD_IMAGES := android-arm android-arm64 android-x86 android-x86_64 \
|
||||
linux-i686 linux-x86 linux-x64 linux-x64-clang linux-arm64-musl linux-arm64-full \
|
||||
@ -93,13 +95,6 @@ windows-armv7.test_ARGS = --exe-suffix ".exe"
|
||||
windows-arm64.test_ARGS = --exe-suffix ".exe"
|
||||
bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs"
|
||||
|
||||
# On CircleCI, do not attempt to delete container
|
||||
# See https://circleci.com/docs/docker-btrfs-error/
|
||||
RM = --rm
|
||||
ifeq ("$(CIRCLECI)", "true")
|
||||
RM =
|
||||
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)
|
||||
|
||||
@ -124,20 +119,7 @@ test: base.test $(addsuffix .test,$(IMAGES))
|
||||
#
|
||||
|
||||
$(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_PATH)
|
||||
sed \
|
||||
-e '/common.docker/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.docker' \
|
||||
-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
|
||||
-e '/common.manylinux_2_28/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_28' \
|
||||
-e '/common.manylinux_2_34/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_34' \
|
||||
-e '/common.manylinux2014/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux2014' \
|
||||
-e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \
|
||||
-e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \
|
||||
-e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \
|
||||
-e '/common.webassembly/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.webassembly' \
|
||||
-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
|
||||
-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \
|
||||
-e '/common.label-and-env/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.label-and-env' \
|
||||
$< > $@
|
||||
sed $(foreach f,$(DOCKER_COMPOSITE_SOURCES),-e '/$(f)/ r $(DOCKER_COMPOSITE_FOLDER_PATH)$(f)') $< > $@
|
||||
|
||||
#
|
||||
# web-wasm
|
||||
|
Reference in New Issue
Block a user