github/docker-amiga-gcc
1
0
Fork 0
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git synced 2026-05-04 11:33:51 +00:00
Code Issues Releases Wiki Activity

Put all images on same level

Browse Source 
Update toolchains submodule
This commit is contained in:
Marlon Beijer
2020-02-13 17:59:03 +01:00
parent f042b4a549
commit 00a97e22b3
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common.docker
View File

@@ -1,10 +1,8 @@
# START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com" MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
RUN ln -s /opt/${CROSS_PFX} /tools RUN ln -s /opt/${CROSS_PFX} /tools
ENV CROSS_ROOT /opt/${CROSS_PFX} ENV CROSS_ROOT /opt/${CROSS_PFX}
WORKDIR /work WORKDIR /work
@@ -16,12 +14,23 @@ COPY imagefiles/entrypoint.sh /entry/
ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \ LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \
AR=${CROSS_ROOT}/bin/${CROSS_PFX}-ar \ AR=${CROSS_ROOT}/bin/${CROSS_PFX}-ar \
CC=${CROSS_ROOT}/bin/${CROSS_PFX}-gcc \ CC=${CROSS_ROOT}/bin/${CROSS_PFX}-gcc \
CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \ CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \
RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib
RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin
# END COMMON

2
dependencies/toolchains vendored

Submodule dependencies/toolchains updated: 6b8d3ced2b...fb2f1acdfc

3
m68k-amigaos.docker
View File

@@ -3,6 +3,7 @@ FROM amigadev/m68k-amigaos-gcc:latest as build-env
FROM amigadev/docker-base:latest FROM amigadev/docker-base:latest
ENV CROSS_PFX m68k-amigaos ENV CROSS_PFX m68k-amigaos
ENV OS_NAME AmigaOS
# Temporary fix # Temporary fix
COPY --from=build-env /opt/amiga /opt/${CROSS_PFX} COPY --from=build-env /opt/amiga /opt/${CROSS_PFX}
@@ -39,7 +40,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/AmigaOS.cmake RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin

5
ppc-amigaos.docker
View File

@@ -3,12 +3,12 @@ FROM amigadev/adtools:latest as build-env
FROM amigadev/docker-base:latest FROM amigadev/docker-base:latest
ENV CROSS_PFX ppc-amigaos ENV CROSS_PFX ppc-amigaos
ENV OS_NAME AmigaOS
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX} COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
# START COMMON # START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com" MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
RUN ln -s /opt/${CROSS_PFX} /tools RUN ln -s /opt/${CROSS_PFX} /tools
@@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin

5
ppc-morphos.docker
View File

@@ -3,12 +3,12 @@ FROM amigadev/morphos-cross-toolchain:latest as build-env
FROM amigadev/docker-base:latest FROM amigadev/docker-base:latest
ENV CROSS_PFX ppc-morphos ENV CROSS_PFX ppc-morphos
ENV OS_NAME MorphOS
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX} COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
# START COMMON # START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com" MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
RUN ln -s /opt/${CROSS_PFX} /tools RUN ln -s /opt/${CROSS_PFX} /tools
@@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin