Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-15 07:21:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in many images

Browse Source
This commit is contained in:
Bensuperpc 2021-05-08 08:57:52 +02:00
parent 85a579b3bb
commit 25c411eb28
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-armv7/Dockerfile.in
View File

@ -12,7 +12,7 @@ RUN apt-get update \
&& apt-get clean --yes && apt-get clean --yes
# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target. # The CROSS_TRIPLE is a configured alias of the "arm-unknown-linux-gnueabi" target.
ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE} ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \

2
linux-armv7/crosstool-ng.config
View File

@ -183,7 +183,7 @@ CT_ARCH_SUPPORTS_WITH_TUNE=y
# CT_ARCH_SUPPORTS_SOFTFP is not set # CT_ARCH_SUPPORTS_SOFTFP is not set
CT_ARCH_EXCLUSIVE_WITH_CPU=y CT_ARCH_EXCLUSIVE_WITH_CPU=y
CT_ARCH_ARCH="" CT_ARCH_ARCH=""
CT_ARCH_FPU="" CT_ARCH_FPU="neon"
# CT_ARCH_FLOAT_AUTO is not set # CT_ARCH_FLOAT_AUTO is not set
# CT_ARCH_FLOAT_HW is not set # CT_ARCH_FLOAT_HW is not set
# CT_ARCH_FLOAT_SOFTFP is not set # CT_ARCH_FLOAT_SOFTFP is not set

7
linux-armv7a/Dockerfile.in
View File

@ -12,9 +12,8 @@ RUN apt-get update \
&& apt-get clean --yes && apt-get clean --yes
# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target. # The CROSS_TRIPLE is a configured alias of the "armv7-unknown-linux-gnueabi" target.
#ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
ENV CROSS_TRIPLE arm-cortexa8_neon-linux-gnueabihf
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE} ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@ -27,8 +26,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7a
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

3
linux-armv7a/Toolchain.cmake
View File

@ -1,7 +1,8 @@
set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_SYSTEM_PROCESSOR arm)
set(cross_triple "arm-cortexa8_neon-linux-gnueabihf") set(cross_triple "armv7-unknown-linux-gnueabi")
#arm-cortexa8_neon-linux-gnueabihf
set(cross_root /usr/xcc/${cross_triple}) set(cross_root /usr/xcc/${cross_triple})
set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_C_COMPILER $ENV{CC})

2
linux-armv8/crosstool-ng.config
View File

@ -148,7 +148,7 @@ CT_ARCH_ARM_MODE_ARM=y
CT_ARCH_ARM_EABI_FORCE=y CT_ARCH_ARM_EABI_FORCE=y
CT_ARCH_ARM_EABI=y CT_ARCH_ARM_EABI=y
CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA" CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX="v8" CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set # CT_OMIT_TARGET_VENDOR is not set
# #

4
linux-mipsel/Dockerfile.in
View File

@ -4,8 +4,8 @@ MAINTAINER Sergi Alvarez "pancake@nopcode.org"
# This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float # This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float
# VFP instructions (mipshf). # VFP instructions (mipshf).
# From https://wiki.debian.org/CrossToolchains, installing for jessie # From https://wiki.debian.org/CrossToolchains, installing for stretch
RUN echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/emdebian.list \ RUN echo "deb http://emdebian.org/tools/debian/ stretch main" > /etc/apt/sources.list.d/emdebian.list \
&& curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - \ && curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - \
&& sed -i 's/httpredir.debian.org/http.debian.net/' /etc/apt/sources.list \ && sed -i 's/httpredir.debian.org/http.debian.net/' /etc/apt/sources.list \
&& dpkg --add-architecture mipsel \ && dpkg --add-architecture mipsel \