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

linux-x86: Update and add testing.

Browse Source
This commit is contained in:
Matt McCormick
2016-04-06 16:48:12 -04:00
parent 5031a312a6
commit af5c3fecec
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -11,7 +11,7 @@ browser-asmjs: base browser-asmjs/Dockerfile
$(DOCKER) build -t $(IMAGE)-browser-asmjs browser-asmjs $(DOCKER) build -t $(IMAGE)-browser-asmjs browser-asmjs
linux-x86: linux-x86:
$(DOCKER) build -t $(IMAGE)-darwin-x86 darwin-x86 $(DOCKER) build -t $(IMAGE)-linux-x86 linux-x86
linux-x64: linux-x64:
$(DOCKER) build -t $(IMAGE)-linux-x64 linux-x64 $(DOCKER) build -t $(IMAGE)-linux-x64 linux-x64

4
circle.yml
View File

@@ -12,6 +12,7 @@ dependencies:
- docker pull thewtex/cross-compiler-linux-armv7 - docker pull thewtex/cross-compiler-linux-armv7
- docker pull thewtex/cross-compiler-linux-ppc64le - docker pull thewtex/cross-compiler-linux-ppc64le
- docker pull thewtex/cross-compiler-linux-x64 - docker pull thewtex/cross-compiler-linux-x64
- docker pull thewtex/cross-compiler-linux-x86
test: test:
override: override:
@@ -29,6 +30,8 @@ test:
- docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-ppc64le python /usr/src/test/run.py --emulator /usr/bin/qemu-ppc64le --languages C - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-ppc64le python /usr/src/test/run.py --emulator /usr/bin/qemu-ppc64le --languages C
- make linux-x64 - make linux-x64
- docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-x64 python /usr/src/test/run.py - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-x64 python /usr/src/test/run.py
- make linux-x86
- docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-x86 python /usr/src/test/run.py
deployment: deployment:
hub: hub:
@@ -42,3 +45,4 @@ deployment:
- docker push thewtex/cross-compiler-linux-armv7 - docker push thewtex/cross-compiler-linux-armv7
- docker push thewtex/cross-compiler-linux-ppc64le - docker push thewtex/cross-compiler-linux-ppc64le
- docker push thewtex/cross-compiler-linux-x64 - docker push thewtex/cross-compiler-linux-x64
- docker push thewtex/cross-compiler-linux-x86

41
linux-x86/Dockerfile
View File

@@ -1,28 +1,21 @@
FROM steeve/cross-compiler:base FROM thewtex/cross-compiler-base
MAINTAINER Steeve Morin "steeve.morin@gmail.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
RUN apt-get update && apt-get -y install \ RUN dpkg --add-architecture i386 && \
gcc-multilib \ apt-get update && apt-get -y install \
g++-multilib gcc-multilib \
g++-multilib
ENV CROSS_TRIPLE i686-linux-gnu ENV CROSS_TRIPLE i686-linux-gnu
ENV CROSS_ROOT /usr/i686-linux-gnu ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV LD_LIBRARY_PATH ${CROSS_ROOT}/lib:${LD_LIBRARY_PATH} RUN mkdir -p ${CROSS_ROOT}/bin
COPY ${CROSS_TRIPLE}.sh ${CROSS_ROOT}/bin/${CROSS_TRIPLE}.sh
COPY ${CROSS_TRIPLE}.sh /usr/bin/${CROSS_TRIPLE}.sh RUN cd ${CROSS_ROOT}/bin && \
RUN mkdir -p ${CROSS_ROOT} && \ chmod +x ${CROSS_TRIPLE}.sh && \
cd /usr/bin && \ ln -s /usr/bin/x86_64-linux-gnu-gcc && \
chmod +x ${CROSS_TRIPLE}.sh && \ ln -s /usr/bin/x86_64-linux-gnu-g++ && \
ln -s x86_64-linux-gnu-gcc x86_64-linux-gnu-cc && \ ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-gcc && \
ln -s x86_64-linux-gnu-g++ x86_64-linux-gnu-c++ && \ ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-g++
ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-gcc && \ ENV CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-cc && \ CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-g++ && \
ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-c++ && \
for i in strip objdump; do \
ln -s ${i} ${CROSS_TRIPLE}-${i} ; \
done && \
for i in ranlib nm ar; do \
ln -s x86_64-linux-gnu-gcc-${i}-4.7 ${CROSS_TRIPLE}-${i} ; \
done