mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-10-30 23:56:23 +01:00 
			
		
		
		
	Compare commits
	
		
			14 Commits
		
	
	
		
			improve_ma
			...
			update_lin
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f7505027fc | |||
|   | 795dd4dd1f | ||
| 78b96c7a09 | |||
| 336eacf372 | |||
| f65a5ab72b | |||
| 5edf6c6771 | |||
| 260ccce125 | |||
| 3af48d4336 | |||
| 8ebd448ba9 | |||
| 7213d19795 | |||
| 66b9c2b62c | |||
|   | de7b1b0832 | ||
|   | 8896857839 | ||
|   | e37ca78f82 | 
							
								
								
									
										4
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							| @@ -32,7 +32,7 @@ jobs: | |||||||
|         if: github.ref == 'refs/heads/master' |         if: github.ref == 'refs/heads/master' | ||||||
|         run: | |         run: | | ||||||
|             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} |             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} | ||||||
|             docker image push dockcross/base |             docker image push dockcross/base --all-tags | ||||||
|  |  | ||||||
|   image: |   image: | ||||||
|     name: ${{ matrix.arch_name }} |     name: ${{ matrix.arch_name }} | ||||||
| @@ -58,4 +58,4 @@ jobs: | |||||||
|         if: github.ref == 'refs/heads/master' |         if: github.ref == 'refs/heads/master' | ||||||
|         run: | |         run: | | ||||||
|             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} |             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} | ||||||
|             docker image push dockcross/${{ matrix.arch_name }} |             docker image push dockcross/${{ matrix.arch_name }} --all-tags | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| FROM debian:stretch-20190326-slim | FROM debian:buster-slim | ||||||
| MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | ||||||
|  |  | ||||||
| #include "common.debian" | #include "common.debian" | ||||||
|   | |||||||
							
								
								
									
										86
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										86
									
								
								Makefile
									
									
									
									
									
								
							| @@ -79,18 +79,12 @@ web-wasm: web-wasm/Dockerfile | |||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	cp -r test web-wasm/ | 	cp -r test web-wasm/ | ||||||
| 	$(DOCKER) build -t $(ORG)/web-wasm:latest \ | 	$(DOCKER) build -t $(ORG)/web-wasm:latest \ | ||||||
|  | 		-t $(ORG)/web-wasm:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/web-wasm \ | 		--build-arg IMAGE=$(ORG)/web-wasm \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		web-wasm | 		web-wasm | ||||||
| 	$(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/web-wasm \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		web-wasm |  | ||||||
| 	rm -rf web-wasm/test | 	rm -rf web-wasm/test | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| @@ -106,18 +100,12 @@ web-wasm.test: web-wasm | |||||||
| manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile | manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \ | ||||||
|  | 		-t $(ORG)/manylinux2014-aarch64:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \ | 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux2014-aarch64/Dockerfile . | 		-f manylinux2014-aarch64/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux2014-aarch64/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux2014-aarch64.test: manylinux2014-aarch64 | manylinux2014-aarch64.test: manylinux2014-aarch64 | ||||||
| @@ -130,18 +118,12 @@ manylinux2014-aarch64.test: manylinux2014-aarch64 | |||||||
| manylinux2014-x64: manylinux2014-x64/Dockerfile | manylinux2014-x64: manylinux2014-x64/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \ | ||||||
|  | 		-t $(ORG)/manylinux2014-x64:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \ | 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux2014-x64/Dockerfile . | 		-f manylinux2014-x64/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux2014-x64/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux2014-x64.test: manylinux2014-x64 | manylinux2014-x64.test: manylinux2014-x64 | ||||||
| @@ -154,18 +136,12 @@ manylinux2014-x64.test: manylinux2014-x64 | |||||||
| manylinux2014-x86: manylinux2014-x86/Dockerfile | manylinux2014-x86: manylinux2014-x86/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \ | ||||||
|  | 		-t $(ORG)/manylinux2014-x86:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \ | 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux2014-x86/Dockerfile . | 		-f manylinux2014-x86/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux2014-x86/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux2014-x86.test: manylinux2014-x86 | manylinux2014-x86.test: manylinux2014-x86 | ||||||
| @@ -179,18 +155,12 @@ manylinux2014-x86.test: manylinux2014-x86 | |||||||
| manylinux2010-x64: manylinux2010-x64/Dockerfile | manylinux2010-x64: manylinux2010-x64/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \ | ||||||
|  | 		-t $(ORG)/manylinux2010-x64:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \ | 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux2010-x64/Dockerfile . | 		-f manylinux2010-x64/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux2010-x64/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux2010-x64.test: manylinux2010-x64 | manylinux2010-x64.test: manylinux2010-x64 | ||||||
| @@ -204,18 +174,12 @@ manylinux2010-x64.test: manylinux2010-x64 | |||||||
| manylinux2010-x86: manylinux2010-x86/Dockerfile | manylinux2010-x86: manylinux2010-x86/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \ | ||||||
|  | 		-t $(ORG)/manylinux2010-x86:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \ | 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux2010-x86/Dockerfile . | 		-f manylinux2010-x86/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux2010-x86/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux2010-x86.test: manylinux2010-x86 | manylinux2010-x86.test: manylinux2010-x86 | ||||||
| @@ -229,18 +193,12 @@ manylinux2010-x86.test: manylinux2010-x86 | |||||||
| manylinux1-x64: manylinux1-x64/Dockerfile | manylinux1-x64: manylinux1-x64/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \ | ||||||
|  | 		-t $(ORG)/manylinux1-x64:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \ | 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux1-x64/Dockerfile . | 		-f manylinux1-x64/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux1-x64/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux1-x64.test: manylinux1-x64 | manylinux1-x64.test: manylinux1-x64 | ||||||
| @@ -254,18 +212,12 @@ manylinux1-x64.test: manylinux1-x64 | |||||||
| manylinux1-x86: manylinux1-x86/Dockerfile | manylinux1-x86: manylinux1-x86/Dockerfile | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \ | 	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \ | ||||||
|  | 		-t $(ORG)/manylinux1-x86:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \ | 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		-f manylinux1-x86/Dockerfile . | 		-f manylinux1-x86/Dockerfile . | ||||||
| 	$(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		-f manylinux1-x86/Dockerfile . |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| manylinux1-x86.test: manylinux1-x86 | manylinux1-x86.test: manylinux1-x86 | ||||||
| @@ -278,14 +230,10 @@ manylinux1-x86.test: manylinux1-x86 | |||||||
|  |  | ||||||
| base: Dockerfile imagefiles/ | base: Dockerfile imagefiles/ | ||||||
| 	$(DOCKER) build -t $(ORG)/base:latest \ | 	$(DOCKER) build -t $(ORG)/base:latest \ | ||||||
|  | 		-t $(ORG)/base:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/base \ | 		--build-arg IMAGE=$(ORG)/base \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		. | 		. | ||||||
| 	$(DOCKER) build -t $(ORG)/base:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/base \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		. |  | ||||||
|  |  | ||||||
| base.test: base | base.test: base | ||||||
| 	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base | 	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base | ||||||
| @@ -305,18 +253,12 @@ $(VERBOSE).SILENT: display_images | |||||||
| $(STANDARD_IMAGES): %: %/Dockerfile base | $(STANDARD_IMAGES): %: %/Dockerfile base | ||||||
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | 	mkdir -p $@/imagefiles && cp -r imagefiles $@/ | ||||||
| 	$(DOCKER) build -t $(ORG)/$@:latest \ | 	$(DOCKER) build -t $(ORG)/$@:latest \ | ||||||
|  | 		-t $(ORG)/$@:$(TAG) \ | ||||||
| 		--build-arg IMAGE=$(ORG)/$@ \ | 		--build-arg IMAGE=$(ORG)/$@ \ | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | 		--build-arg VCS_URL=`git config --get remote.origin.url` \ | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ | ||||||
| 		$@ | 		$@ | ||||||
| 	$(DOCKER) build -t $(ORG)/$@:$(TAG) \ |  | ||||||
| 		--build-arg IMAGE=$(ORG)/$@ \ |  | ||||||
| 		--build-arg VERSION=$(TAG) \ |  | ||||||
| 		--build-arg VCS_REF=`git rev-parse --short HEAD` \ |  | ||||||
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \ |  | ||||||
| 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ |  | ||||||
| 		$@ |  | ||||||
| 	rm -rf $@/imagefiles | 	rm -rf $@/imagefiles | ||||||
|  |  | ||||||
| clean: | clean: | ||||||
| @@ -324,13 +266,19 @@ clean: | |||||||
| 	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done | 	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done | ||||||
| 	rm -f Dockerfile | 	rm -f Dockerfile | ||||||
|  |  | ||||||
|  | purge: clean | ||||||
|  | # Remove all untagged images | ||||||
|  | 	$(DOCKER) container ls -aq | xargs --no-run-if-empty $(DOCKER) container rm -f | ||||||
|  | # Remove all images with organization (ex dockcross/*) | ||||||
|  | 	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f | ||||||
|  |  | ||||||
| # | # | ||||||
| # testing implicit rule | # testing implicit rule | ||||||
| # | # | ||||||
| .SECONDEXPANSION: | .SECONDEXPANSION: | ||||||
| $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@) | $(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 $@) python test/run.py $($@_ARGS) | 	$(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS) | ||||||
|  |  | ||||||
| # | # | ||||||
| # testing prerequisites implicit rule | # testing prerequisites implicit rule | ||||||
|   | |||||||
| @@ -48,6 +48,7 @@ ENV XCC_PREFIX=/usr/xcc | |||||||
| COPY \ | COPY \ | ||||||
|   imagefiles/install-crosstool-ng-toolchain.sh \ |   imagefiles/install-crosstool-ng-toolchain.sh \ | ||||||
|   imagefiles/crosstool-ng-expat.patch \ |   imagefiles/crosstool-ng-expat.patch \ | ||||||
|  |   imagefiles/Fix-error-with-bash-5-and-up.patch \ | ||||||
|   manylinux2014-aarch64/crosstool-ng.config \ |   manylinux2014-aarch64/crosstool-ng.config \ | ||||||
|   /dockcross/ |   /dockcross/ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -16,12 +16,18 @@ | |||||||
|  |  | ||||||
| # Install Debian packages required for `ct-ng`. | # Install Debian packages required for `ct-ng`. | ||||||
| RUN apt-get update --yes && apt-get install --no-install-recommends --yes \ | RUN apt-get update --yes && apt-get install --no-install-recommends --yes \ | ||||||
|   gawk \ |     gawk \ | ||||||
|   gperf \ |     gperf \ | ||||||
|   help2man \ |     help2man \ | ||||||
|   python-dev \ |     python3-dev \ | ||||||
|   texinfo \ |     texinfo \ | ||||||
| && apt-get clean --yes | # Packages needed for crosstool-ng 1.24 or higher  | ||||||
|  |     unzip \ | ||||||
|  |     libtool \ | ||||||
|  |     libtool-bin \ | ||||||
|  |     && apt-get clean autoclean --yes \ | ||||||
|  |     && apt-get autoremove --yes \ | ||||||
|  |     && rm -rf /var/lib/{apt,dpkg,cache,log}/ | ||||||
|  |  | ||||||
| ENV XCC_PREFIX=/usr/xcc | ENV XCC_PREFIX=/usr/xcc | ||||||
|  |  | ||||||
| @@ -33,6 +39,7 @@ ENV XCC_PREFIX=/usr/xcc | |||||||
| COPY \ | COPY \ | ||||||
|   imagefiles/install-crosstool-ng-toolchain.sh \ |   imagefiles/install-crosstool-ng-toolchain.sh \ | ||||||
|   imagefiles/crosstool-ng-expat.patch \ |   imagefiles/crosstool-ng-expat.patch \ | ||||||
|  |   imagefiles/Fix-error-with-bash-5-and-up.patch \ | ||||||
|   crosstool-ng.config \ |   crosstool-ng.config \ | ||||||
|   /dockcross/ |   /dockcross/ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,11 +1,6 @@ | |||||||
| ARG DEBIAN_FRONTEND=noninteractive | ARG DEBIAN_FRONTEND=noninteractive | ||||||
| ARG REPO=http://cdn-fastly.deb.debian.org |  | ||||||
|  |  | ||||||
| RUN \ | RUN \ | ||||||
|   bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list"  && \ |  | ||||||
|   bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list"  && \ |  | ||||||
|   bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \ |  | ||||||
|   bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \ |  | ||||||
|   apt-get update --yes && \ |   apt-get update --yes && \ | ||||||
|   apt-get install --no-install-recommends --yes \ |   apt-get install --no-install-recommends --yes \ | ||||||
|     autogen \ |     autogen \ | ||||||
| @@ -30,8 +25,8 @@ RUN \ | |||||||
|     ncurses-dev \ |     ncurses-dev \ | ||||||
|     pkg-config \ |     pkg-config \ | ||||||
|     pax \ |     pax \ | ||||||
| #    python3 \ |     python3 \ | ||||||
| #    python3-pip \ |     python3-pip \ | ||||||
|     rsync \ |     rsync \ | ||||||
|     sed \ |     sed \ | ||||||
|     ssh \ |     ssh \ | ||||||
| @@ -41,23 +36,10 @@ RUN \ | |||||||
|     xz-utils \ |     xz-utils \ | ||||||
|     zip \ |     zip \ | ||||||
|     zlib1g-dev \ |     zlib1g-dev \ | ||||||
| # python build | #    python-is-python3 \ | ||||||
|     libncurses5-dev \ |     && apt-get clean autoclean --yes \ | ||||||
|     libgdbm-dev \ |     && apt-get autoremove --yes \ | ||||||
|     libnss3-dev \ |     && rm -rf /var/lib/{apt,dpkg,cache,log}/ | ||||||
|     libssl-dev \ |  | ||||||
|     libsqlite3-dev \ |  | ||||||
|     libreadline-dev \ |  | ||||||
|     libffi-dev \ |  | ||||||
|     libbz2-dev\ |  | ||||||
|   && \ |  | ||||||
|   apt-get clean --yes |  | ||||||
|  |  | ||||||
| # build and install python | RUN ln -s /usr/bin/python3 /usr/bin/python \ | ||||||
| COPY \ |     && ln -s /usr/bin/pip3 /usr/bin/pip | ||||||
|   imagefiles/build-and-install-python.sh \ |  | ||||||
|   /buildscripts/ |  | ||||||
| RUN \ |  | ||||||
|   set -x && \ |  | ||||||
|   /buildscripts/build-and-install-python.sh && \ |  | ||||||
|   rm -rf /buildscripts |  | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ RUN \ | |||||||
|   /buildscripts/build-and-install-git.sh && \ |   /buildscripts/build-and-install-git.sh && \ | ||||||
|   /buildscripts/install-cmake-binary.sh $X86_FLAG && \ |   /buildscripts/install-cmake-binary.sh $X86_FLAG && \ | ||||||
|   /buildscripts/install-liquidprompt-binary.sh && \ |   /buildscripts/install-liquidprompt-binary.sh && \ | ||||||
|   PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python") && \ |   PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ | ||||||
|   /buildscripts/install-python-packages.sh -python ${PYTHON} && \ |   /buildscripts/install-python-packages.sh -python ${PYTHON} && \ | ||||||
|   /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ |   /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ | ||||||
|   rm -rf /buildscripts |   rm -rf /buildscripts | ||||||
|   | |||||||
							
								
								
									
										28
									
								
								imagefiles/Fix-error-with-bash-5-and-up.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								imagefiles/Fix-error-with-bash-5-and-up.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,28 @@ | |||||||
|  | From 67368ebe9d9259e9f34a4f9166a33357858813f1 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Bensuperpc <bensuperpc@gmail.com> | ||||||
|  | Date: Thu, 24 Jun 2021 11:55:48 +0200 | ||||||
|  | Subject: [PATCH 1/1] Fix error with bash 5 and up | ||||||
|  |  | ||||||
|  | Fix error with bash 5 and up | ||||||
|  |  | ||||||
|  | Signed-off-by: Bensuperpc <bensuperpc@gmail.com> | ||||||
|  | --- | ||||||
|  |  configure.ac | 2 +- | ||||||
|  |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
|  |  | ||||||
|  | diff --git a/configure.ac b/configure.ac | ||||||
|  | index d10bf71d..e2302b4c 100644 | ||||||
|  | --- a/configure.ac | ||||||
|  | +++ b/configure.ac | ||||||
|  | @@ -274,7 +274,7 @@ ACX_PROG_VERSION_REQ_STRICT([BASH_SHELL], | ||||||
|  |      [GNU bash >= 3.1], | ||||||
|  |      [bash], | ||||||
|  |      [bash], | ||||||
|  | -    ['^GNU bash, version (3\.[1-9]|4)']) | ||||||
|  | +    ['^GNU bash, version (3\.[1-9]|4|5)']) | ||||||
|  |   | ||||||
|  |  # We need a awk that *is* GNU awk | ||||||
|  |  ACX_PROG_VERSION_REQ_STRICT([AWK], | ||||||
|  | --  | ||||||
|  | 2.32.0 | ||||||
|  |  | ||||||
| @@ -6,6 +6,8 @@ | |||||||
| # Usage: | # Usage: | ||||||
| # | # | ||||||
| #  build-and-install-python.sh [-version 3.9.5] | #  build-and-install-python.sh [-version 3.9.5] | ||||||
|  | # needed packages : libncurses5-dev libgdbm-dev libnss3-dev  | ||||||
|  | #   libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev | ||||||
|  |  | ||||||
| PYTHON_VERSION=3.9.5 | PYTHON_VERSION=3.9.5 | ||||||
| while [ $# -gt 0 ]; do | while [ $# -gt 0 ]; do | ||||||
|   | |||||||
| @@ -77,6 +77,8 @@ git checkout ${REV} | |||||||
|  |  | ||||||
| if [ ${REV} = "crosstool-ng-1.23.0" ]; then | if [ ${REV} = "crosstool-ng-1.23.0" ]; then | ||||||
|   patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch |   patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch | ||||||
|  |   # Patch to fix error with bash 5 and up: https://github.com/pfalcon/esp-open-sdk/issues/365 | ||||||
|  |   patch configure.ac -i /dockcross/Fix-error-with-bash-5-and-up.patch | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Bootstrap and install the tool. | # Bootstrap and install the tool. | ||||||
| @@ -112,5 +114,5 @@ unset LD_LIBRARY_PATH | |||||||
|  |  | ||||||
| # Build and install the toolchain! | # Build and install the toolchain! | ||||||
| # Print last 250 lines if build fail | # Print last 250 lines if build fail | ||||||
| "${BOOTSTRAP_PREFIX}/bin/ct-ng" build || tail -250 build.log | "${BOOTSTRAP_PREFIX}/bin/ct-ng" build || (tail -250 build.log && exit 1) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,6 +5,9 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | |||||||
| # VFP instructions (armhf). | # VFP instructions (armhf). | ||||||
| # musleabi as default glibc | # musleabi as default glibc | ||||||
|  |  | ||||||
|  | # We use a git commit while waiting for 1.25 to release (1.24 is several years old) | ||||||
|  | ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667 | ||||||
|  |  | ||||||
| #include "common.crosstool" | #include "common.crosstool" | ||||||
|  |  | ||||||
| # The cross-compiling emulator | # The cross-compiling emulator | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -11,9 +11,7 @@ CT_CONFIGURE_has_libtool_2_4_or_newer=y | |||||||
| CT_CONFIGURE_has_libtoolize_2_4_or_newer=y | CT_CONFIGURE_has_libtoolize_2_4_or_newer=y | ||||||
| CT_CONFIGURE_has_autoconf_2_63_or_newer=y | CT_CONFIGURE_has_autoconf_2_63_or_newer=y | ||||||
| CT_CONFIGURE_has_autoreconf_2_63_or_newer=y | CT_CONFIGURE_has_autoreconf_2_63_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_gnu_m4_1_4_12_or_newer=y | ||||||
| CT_CONFIGURE_has_svn=y |  | ||||||
| CT_CONFIGURE_has_git=y | CT_CONFIGURE_has_git=y | ||||||
| CT_MODULES=y | CT_MODULES=y | ||||||
|  |  | ||||||
| @@ -235,14 +233,14 @@ CT_TOOLCHAIN_ENABLE_NLS=y | |||||||
| # | # | ||||||
| CT_KERNEL_SUPPORTS_SHARED_LIBS=y | CT_KERNEL_SUPPORTS_SHARED_LIBS=y | ||||||
| CT_KERNEL="linux" | CT_KERNEL="linux" | ||||||
| CT_KERNEL_VERSION="4.9.36" | CT_KERNEL_VERSION="4.10.8" | ||||||
| # CT_KERNEL_bare_metal is not set | # CT_KERNEL_bare_metal is not set | ||||||
| CT_KERNEL_linux=y | CT_KERNEL_linux=y | ||||||
| CT_KERNEL_bare_metal_AVAILABLE=y | CT_KERNEL_bare_metal_AVAILABLE=y | ||||||
| CT_KERNEL_linux_AVAILABLE=y | CT_KERNEL_linux_AVAILABLE=y | ||||||
| # CT_KERNEL_LINUX_CUSTOM is not set | # CT_KERNEL_LINUX_CUSTOM is not set | ||||||
| #CT_KERNEL_V_4_10=y | CT_KERNEL_V_4_10=y | ||||||
| CT_KERNEL_V_4_9=y | # CT_KERNEL_V_4_9 is not set | ||||||
| # CT_KERNEL_V_4_4 is not set | # CT_KERNEL_V_4_4 is not set | ||||||
| # CT_KERNEL_V_4_1 is not set | # CT_KERNEL_V_4_1 is not set | ||||||
| # CT_KERNEL_V_3_16 is not set | # CT_KERNEL_V_3_16 is not set | ||||||
| @@ -316,17 +314,15 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY="" | |||||||
| # C-library | # C-library | ||||||
| # | # | ||||||
| CT_LIBC="glibc" | CT_LIBC="glibc" | ||||||
| CT_LIBC_VERSION="2.24" | CT_LIBC_VERSION="2.27" | ||||||
| CT_LIBC_glibc=y | CT_LIBC_glibc=y | ||||||
| # CT_LIBC_musl is not set |  | ||||||
| # CT_LIBC_uClibc is not set | # CT_LIBC_uClibc is not set | ||||||
| CT_LIBC_avr_libc_AVAILABLE=y | CT_LIBC_avr_libc_AVAILABLE=y | ||||||
| CT_LIBC_glibc_AVAILABLE=y | CT_LIBC_glibc_AVAILABLE=y | ||||||
| CT_THREADS="nptl" | CT_THREADS="nptl" | ||||||
| # CT_LIBC_GLIBC_CUSTOM is not set | CT_CC_GLIBC_SHOW_LINARO=y | ||||||
| # CT_CC_GLIBC_SHOW_LINARO is not set | # CT_LIBC_GLIBC_V_2_25 is not set | ||||||
| #CT_LIBC_GLIBC_V_2_25=y | # CT_LIBC_GLIBC_V_2_24 is not set | ||||||
| CT_LIBC_GLIBC_V_2_24=y |  | ||||||
| # CT_LIBC_GLIBC_V_2_23 is not set | # CT_LIBC_GLIBC_V_2_23 is not set | ||||||
| CT_LIBC_GLIBC_2_23_or_later=y | CT_LIBC_GLIBC_2_23_or_later=y | ||||||
| CT_LIBC_GLIBC_2_20_or_later=y | CT_LIBC_GLIBC_2_20_or_later=y | ||||||
| @@ -409,14 +405,10 @@ CT_CC_CORE_PASSES_NEEDED=y | |||||||
| CT_CC_CORE_PASS_1_NEEDED=y | CT_CC_CORE_PASS_1_NEEDED=y | ||||||
| CT_CC_CORE_PASS_2_NEEDED=y | CT_CC_CORE_PASS_2_NEEDED=y | ||||||
| CT_CC_gcc=y | CT_CC_gcc=y | ||||||
| # CT_CC_GCC_CUSTOM is not set | CT_CC_GCC_VERSION="7.3.0" | ||||||
| CT_CC_GCC_VERSION="linaro-6.3-2017.02" | # CT_CC_GCC_SHOW_LINARO is not set | ||||||
| CT_CC_GCC_SHOW_LINARO=y | CT_CC_GCC_V_6_3_0=y | ||||||
| CT_CC_GCC_V_linaro_6_3=y |  | ||||||
| # CT_CC_GCC_V_6_3_0 is not set |  | ||||||
| # CT_CC_GCC_V_linaro_5_4 is not set |  | ||||||
| # CT_CC_GCC_V_5_4_0 is not set | # CT_CC_GCC_V_5_4_0 is not set | ||||||
| # CT_CC_GCC_V_linaro_4_9 is not set |  | ||||||
| # CT_CC_GCC_V_4_9_4 is not set | # CT_CC_GCC_V_4_9_4 is not set | ||||||
| CT_CC_GCC_4_8_or_later=y | CT_CC_GCC_4_8_or_later=y | ||||||
| CT_CC_GCC_4_9_or_later=y | CT_CC_GCC_4_9_or_later=y | ||||||
| @@ -425,7 +417,6 @@ CT_CC_GCC_6=y | |||||||
| CT_CC_GCC_6_or_later=y | CT_CC_GCC_6_or_later=y | ||||||
| CT_CC_GCC_ENABLE_PLUGINS=y | CT_CC_GCC_ENABLE_PLUGINS=y | ||||||
| CT_CC_GCC_GOLD=y | CT_CC_GCC_GOLD=y | ||||||
| CT_CC_GCC_HAS_LIBMPX=y |  | ||||||
| CT_CC_GCC_ENABLE_CXX_FLAGS="" | CT_CC_GCC_ENABLE_CXX_FLAGS="" | ||||||
| CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="" | CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="" | ||||||
| CT_CC_GCC_EXTRA_CONFIG_ARRAY="" | CT_CC_GCC_EXTRA_CONFIG_ARRAY="" | ||||||
| @@ -478,13 +469,8 @@ CT_CC_SUPPORT_GOLANG=y | |||||||
| # Additional supported languages: | # Additional supported languages: | ||||||
| # | # | ||||||
| CT_CC_LANG_CXX=y | CT_CC_LANG_CXX=y | ||||||
| # CT_CC_LANG_FORTRAN is not set | CT_CC_LANG_FORTRAN=y | ||||||
| # CT_CC_LANG_JAVA is not set | # CT_CC_LANG_JAVA is not set | ||||||
| # CT_CC_LANG_ADA is not set |  | ||||||
| # CT_CC_LANG_OBJC is not set |  | ||||||
| # CT_CC_LANG_OBJCXX is not set |  | ||||||
| # CT_CC_LANG_GOLANG is not set |  | ||||||
| CT_CC_LANG_OTHERS="" |  | ||||||
|  |  | ||||||
| # | # | ||||||
| # Debug facilities | # Debug facilities | ||||||
| @@ -506,9 +492,8 @@ CT_GDB_GDBSERVER_HAS_IPA_LIB=y | |||||||
| # | # | ||||||
| # gdb version | # gdb version | ||||||
| # | # | ||||||
| # CT_GDB_CUSTOM is not set | CT_GDB_VERSION="8.1" | ||||||
| CT_GDB_VERSION="7.12.1" | # CT_GDB_V_7_12_1 is not set | ||||||
| CT_GDB_V_7_12_1=y |  | ||||||
| # CT_GDB_V_7_11_1 is not set | # CT_GDB_V_7_11_1 is not set | ||||||
| CT_GDB_7_12_or_later=y | CT_GDB_7_12_or_later=y | ||||||
| CT_GDB_7_2_or_later=y | CT_GDB_7_2_or_later=y | ||||||
|   | |||||||
| @@ -349,7 +349,7 @@ CT_CC_CORE_PASSES_NEEDED=y | |||||||
| CT_CC_CORE_PASS_1_NEEDED=y | CT_CC_CORE_PASS_1_NEEDED=y | ||||||
| CT_CC_CORE_PASS_2_NEEDED=y | CT_CC_CORE_PASS_2_NEEDED=y | ||||||
| CT_CC_gcc=y | CT_CC_gcc=y | ||||||
| CT_CC_GCC_VERSION="6.3.0" | CT_CC_GCC_VERSION="7.3.0" | ||||||
| # CT_CC_GCC_SHOW_LINARO is not set | # CT_CC_GCC_SHOW_LINARO is not set | ||||||
| CT_CC_GCC_V_6_3_0=y | CT_CC_GCC_V_6_3_0=y | ||||||
| # CT_CC_GCC_V_5_4_0 is not set | # CT_CC_GCC_V_5_4_0 is not set | ||||||
|   | |||||||
| @@ -343,7 +343,7 @@ CT_CC_CORE_PASSES_NEEDED=y | |||||||
| CT_CC_CORE_PASS_1_NEEDED=y | CT_CC_CORE_PASS_1_NEEDED=y | ||||||
| CT_CC_CORE_PASS_2_NEEDED=y | CT_CC_CORE_PASS_2_NEEDED=y | ||||||
| CT_CC_gcc=y | CT_CC_gcc=y | ||||||
| CT_CC_GCC_VERSION="6.3.0" | CT_CC_GCC_VERSION="7.3.0" | ||||||
| # CT_CC_GCC_SHOW_LINARO is not set | # CT_CC_GCC_SHOW_LINARO is not set | ||||||
| CT_CC_GCC_V_6_3_0=y | CT_CC_GCC_V_6_3_0=y | ||||||
| # CT_CC_GCC_V_5_4_0 is not set | # CT_CC_GCC_V_5_4_0 is not set | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| FROM emscripten/emsdk:2.0.22 | FROM emscripten/emsdk:2.0.24 | ||||||
| MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | ||||||
|  |  | ||||||
| # Revert back to "/bin/sh" as default shell | # Revert back to "/bin/sh" as default shell | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user