Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 14:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed linux-arm64 compilation I hope.

Browse Source
This commit is contained in:
Nadav Ruskin 2018-05-03 06:49:46 -04:00
parent 143c79e5cd
commit 6191491ba5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 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. # 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)) GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
# These images are expected to have explicit rules for *both* build and testing # These images are expected to have explicit rules for *both* build and testing

10
linux-arm64/Dockerfile → linux-arm64/Dockerfile.in
View File

@ -1,6 +1,6 @@
FROM dockcross/base:latest FROM dockcross/base:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.crosstool"
# Add sources.list # Add sources.list
COPY sources.list /etc/apt/sources.list COPY sources.list /etc/apt/sources.list
@ -9,12 +9,14 @@ RUN apt-get install -y \
libbz2-dev:arm64 \ libbz2-dev:arm64 \
libexpat1-dev:arm64 \ libexpat1-dev:arm64 \
ncurses-dev:arm64 \ ncurses-dev:arm64 \
libssl-dev:arm64 libssl-dev:arm64 \
python-dev
#include "common.crosstool"
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get update && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
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 && \ curl -L http://wiki.qemu-project.org/download/qemu-2.6.0.tar.bz2 | tar xj && \
cd qemu-2.6.0 && \ cd qemu-2.6.0 && \
./configure --target-list=aarch64-linux-user --prefix=/usr && \ ./configure --target-list=aarch64-linux-user --prefix=/usr && \