mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 08:24:25 +01:00
Add linux-x86_64-full and minor fix
Add linux-x86_64-full and minor fix Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
parent
de3942966a
commit
48cee95bf5
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -50,7 +50,7 @@ jobs:
|
||||
linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl,
|
||||
linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full,
|
||||
linux-armv7, linux-armv7a, linux-armv7l-musl,
|
||||
linux-x64-clang, linux-s390x, linux-x64, linux-x86,
|
||||
linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full,
|
||||
linux-mips, linux-ppc64le, web-wasm,
|
||||
manylinux2014-x64, manylinux2014-x86,
|
||||
windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
|
||||
|
4
Makefile
4
Makefile
@ -17,7 +17,7 @@ STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
|
||||
linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
|
||||
linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x linux-x64-tinycc \
|
||||
linux-armv6 linux-armv6-lts linux-armv6-musl \
|
||||
linux-armv7l-musl linux-armv7 linux-armv7a \
|
||||
linux-armv7l-musl linux-armv7 linux-armv7a linux-x86_64-full \
|
||||
linux-mips linux-ppc64le linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
|
||||
windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
|
||||
windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64
|
||||
@ -29,7 +29,7 @@ GEN_IMAGES = android-arm android-arm64 \
|
||||
web-wasm linux-mips windows-arm64 windows-armv7 \
|
||||
windows-static-x86 windows-static-x64 windows-static-x64-posix \
|
||||
windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \
|
||||
linux-armv7 linux-armv7a linux-armv7l-musl \
|
||||
linux-armv7 linux-armv7a linux-armv7l-musl linux-x86_64-full \
|
||||
linux-armv6 linux-armv6-lts linux-armv6-musl \
|
||||
linux-armv5 linux-armv5-musl linux-ppc64le linux-s390x \
|
||||
linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-x64-tinycc linux-xtensa-uclibc
|
||||
|
@ -80,7 +80,7 @@ The dockcross script will execute the given command-line inside the container, a
|
||||
| dockcross/android-x86 | x86 | Clang | Android |
|
||||
| dockcross/android-x86_64 | x86_64 | Clang | Android |
|
||||
| dockcross/linux-arm64 | ARMv8 | GCC | Linux |
|
||||
| dockcross/linux-arm64-full | ARMv8 | GCC | Linux |
|
||||
| dockcross/linux-arm64-full | ARMv8 | GCC + libs | Linux |
|
||||
| dockcross/linux-arm64-musl | ARMv8 | GCC + musl | Linux |
|
||||
| dockcross/linux-armv5 | ARMv5 | GCC | Linux |
|
||||
| dockcross/linux-armv5-musl | ARMv5 | GCC + musl | Linux |
|
||||
@ -101,6 +101,7 @@ The dockcross script will execute the given command-line inside the container, a
|
||||
| dockcross/manylinux2014-x64 | x86_64 | GCC | Linux |
|
||||
| dockcross/linux-x86 | x86 | GCC | Linux |
|
||||
| dockcross/linux-x64 | x86_64 | GCC | Linux |
|
||||
| dockcross/linux-x64-full | x86_64 | GCC + libs | Linux |
|
||||
| dockcross/linux-x64-clang | x86_64 | Clang | Linux |
|
||||
| dockcross/linux-x64-tinycc | x86_64 | tinycc + GCC | Linux |
|
||||
| dockcross/web-wasm | JS | LLVM | Web (JS) |
|
||||
@ -260,6 +261,12 @@ Linux PowerPC 64 little endian cross compiler toolchain for the POWER8, etc. Imp
|
||||
|
||||
Linux x86_64/amd64 compiler. Since the Docker image is natively x86_64, this is not actually a cross compiler.
|
||||
|
||||
### dockcross/linux-x86_64-full
|
||||
|
||||
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x86_64-full/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x86_64-full)
|
||||
|
||||
Linux x86_64/amd64 compiler with libs: SDL2, OpenSSL, Boost, OpenCV and Qt5 (minimal).
|
||||
|
||||
### dockcross/linux-x64-clang
|
||||
|
||||
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-clang/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-clang)
|
||||
|
@ -3,8 +3,8 @@ FROM dockcross/base:latest
|
||||
# This is for 64-bit ARM Linux machine
|
||||
|
||||
# Buildroot version
|
||||
# crosstool-ng master 2021-08-20
|
||||
ENV BR_VERSION dbe3af5532bfc2ecceca5ea2a4604a82021a8748
|
||||
# crosstool-ng master 2021-08-21
|
||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
||||
|
||||
#include "common.buildroot"
|
||||
|
||||
|
@ -2,7 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_VERSION 1)
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||
|
||||
set(cross_triple "x86_64-linux-gnu")
|
||||
set(cross_triple $ENV{CROSS_TRIPLE})
|
||||
set(cross_root $ENV{CROSS_ROOT})
|
||||
|
||||
set(CMAKE_C_COMPILER $ENV{CC})
|
||||
set(CMAKE_CXX_COMPILER $ENV{CXX})
|
||||
|
42
linux-x86_64-full/Dockerfile.in
Normal file
42
linux-x86_64-full/Dockerfile.in
Normal file
@ -0,0 +1,42 @@
|
||||
FROM dockcross/base:latest
|
||||
|
||||
# This is for 64-bit x86 Linux machine
|
||||
|
||||
# Buildroot version
|
||||
# crosstool-ng master 2021-08-21
|
||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
||||
|
||||
#include "common.buildroot"
|
||||
|
||||
# The cross-compiling emulator
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y \
|
||||
qemu-user \
|
||||
qemu-user-static \
|
||||
&& apt-get clean --yes
|
||||
|
||||
# The CROSS_TRIPLE is a configured alias of the "x86_64-buildroot-linux-gnu" target.
|
||||
ENV CROSS_TRIPLE x86_64-buildroot-linux-gnu
|
||||
ENV CROSS_ROOT /buildroot
|
||||
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
|
||||
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
|
||||
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
|
||||
CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
|
||||
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
|
||||
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
||||
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
||||
|
||||
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
|
||||
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
|
||||
|
||||
COPY Toolchain.cmake ${CROSS_ROOT}/
|
||||
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
|
||||
|
||||
#ENV PKG_CONFIG_PATH /usr/lib/x86_64-linux-gnu/pkgconfig
|
||||
|
||||
# Linux kernel cross compilation variables
|
||||
ENV PATH ${PATH}:${CROSS_ROOT}/bin
|
||||
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
|
||||
ENV ARCH arm64
|
||||
|
||||
#include "common.label-and-env"
|
21
linux-x86_64-full/Toolchain.cmake
Normal file
21
linux-x86_64-full/Toolchain.cmake
Normal file
@ -0,0 +1,21 @@
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_VERSION 1)
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||
|
||||
set(cross_triple $ENV{CROSS_TRIPLE})
|
||||
set(cross_root $ENV{CROSS_ROOT})
|
||||
|
||||
set(CMAKE_C_COMPILER $ENV{CC})
|
||||
set(CMAKE_CXX_COMPILER $ENV{CXX})
|
||||
set(CMAKE_Fortran_COMPILER $ENV{FC})
|
||||
|
||||
set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
|
||||
|
||||
set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
|
||||
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-x86_64)
|
3703
linux-x86_64-full/buildroot.config
Normal file
3703
linux-x86_64-full/buildroot.config
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user