Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-09 20:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

restructure makefile for individual builds, restructure linux-arm dockerfiles

Browse Source
This commit is contained in:
Rob Burns 2015-02-01 10:18:38 +07:00
parent e45785c7f7
commit 7a5bc6c22d
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@ -1,15 +1,33 @@
PLATFORMS = android-arm \
darwin-x64 \
linux-x86 \
linux-x64 \
linux-arm \
windows-x86 \
windows-x64
DOCKER = docker DOCKER = docker
IMAGE = steeve/cross-compiler IMAGE = rburns/cross-compiler
all: android-arm:
$(DOCKER) build -t $(IMAGE):android-arm linux-arm
darwin-x64:
$(DOCKER) build -t $(IMAGE):darwin-x64 darwin-x64
linux-x86:
$(DOCKER) build -t $(IMAGE):darwin-x86 darwin-x86
linux-x64:
$(DOCKER) build -t $(IMAGE):linux-x64 linux-x64
linux-armv6:
$(DOCKER) build -t $(IMAGE):linux-arm linux-armv6
linux-armv7:
$(DOCKER) build -t $(IMAGE):linux-armv7 linux-armv7
windows-x86:
$(DOCKER) build -t $(IMAGE):windows-x86 windows-x86
windows-x64:
$(DOCKER) build -t $(IMAGE):windows-x64 windows-x64
base:
$(DOCKER) build -t $(IMAGE):base . $(DOCKER) build -t $(IMAGE):base .
for i in $(PLATFORMS); do \
$(DOCKER) build -t $(IMAGE):$$i $$i ; \ all: base android-arm darwin-x64 linux-x86 linux-x64 linux-arm linux-armv7 windows-x86 windows-x64
done
.PHONY: all linux-armv6 linux-armv7

2
linux-arm/Dockerfile → linux-armv6/Dockerfile
View File

@ -1,4 +1,4 @@
FROM steeve/cross-compiler:base FROM rburns/cross-compiler:base
MAINTAINER Steeve Morin "steeve.morin@gmail.com" MAINTAINER Steeve Morin "steeve.morin@gmail.com"
ENV CROSS_TRIPLE arm-linux-gnueabihf ENV CROSS_TRIPLE arm-linux-gnueabihf

10
linux-arm/Dockerfile.armv7 → linux-armv7/Dockerfile
View File

@ -1,14 +1,12 @@
FROM steeve/cross-compiler:base FROM rburns/cross-compiler:base
MAINTAINER Steeve Morin "steeve.morin@gmail.com" MAINTAINER Steeve Morin "steeve.morin@gmail.com"
# Add the cross compiler sources # Add the cross compiler sources
RUN echo "deb http://toolchains.secretsauce.net unstable main" >> /etc/apt/sources.list && \ RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list && \
dpkg --add-architecture armhf && \ dpkg --add-architecture armhf && \
curl -L http://toolchains.secretsauce.net/key.gpg | apt-key add - curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get install -y crossbuild-essential-armhf
gcc-4.9-arm-linux-gnueabihf \
g++-4.9-arm-linux-gnueabihf
ENV CROSS_TRIPLE arm-linux-gnueabihf ENV CROSS_TRIPLE arm-linux-gnueabihf
ENV CROSS_ROOT /usr/${CROSS_TRIPLE} ENV CROSS_ROOT /usr/${CROSS_TRIPLE}