From 6191491ba51a949eadbfd842a1352699f5ca8489 Mon Sep 17 00:00:00 2001 From: Nadav Ruskin Date: Thu, 3 May 2018 06:49:46 -0400 Subject: [PATCH] Fixed linux-arm64 compilation I hope. --- Makefile | 2 +- linux-arm64/{Dockerfile => Dockerfile.in} | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) rename linux-arm64/{Dockerfile => Dockerfile.in} (94%) diff --git a/Makefile b/Makefile index b2c7eff..4700cfa 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ BIN = ./bin STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-x86 windows-x64 # Generated Dockerfiles. -GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 browser-asmjs +GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 browser-asmjs linux-arm64 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) # These images are expected to have explicit rules for *both* build and testing diff --git a/linux-arm64/Dockerfile b/linux-arm64/Dockerfile.in similarity index 94% rename from linux-arm64/Dockerfile rename to linux-arm64/Dockerfile.in index 1cba3ab..44b88d7 100644 --- a/linux-arm64/Dockerfile +++ b/linux-arm64/Dockerfile.in @@ -1,6 +1,6 @@ FROM dockcross/base:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" -#include "common.crosstool" + # Add sources.list COPY sources.list /etc/apt/sources.list @@ -9,12 +9,14 @@ RUN apt-get install -y \ libbz2-dev:arm64 \ libexpat1-dev:arm64 \ ncurses-dev:arm64 \ - libssl-dev:arm64 + libssl-dev:arm64 \ + python-dev + +#include "common.crosstool" WORKDIR /usr/src -RUN apt-get update && \ - apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ +RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ curl -L http://wiki.qemu-project.org/download/qemu-2.6.0.tar.bz2 | tar xj && \ cd qemu-2.6.0 && \ ./configure --target-list=aarch64-linux-user --prefix=/usr && \