Revert "Fix wrong url"

This reverts commit 1d76812232.
Fix wrong url
2025-10-26 22:16:20 +01:00 · 2021-08-21 22:53:22 +02:00 · 2021-08-21 22:38:09 +02:00 · 2021-08-21 21:09:48 +02:00 · 2021-08-21 01:13:56 +02:00 · 2021-08-20 22:24:01 +02:00
43 changed files with 3867 additions and 84 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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,
--- a/4
+++ b/4
@@ -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
--- a/README.md
+++ b/README.md
@@ -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,8 +101,9 @@ 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 | tcc + GCC | Linux |
+| dockcross/linux-x64-tinycc | x86_64 | tinycc + GCC | Linux |
 | dockcross/web-wasm | JS | LLVM | Web (JS) |
 | dockcross/windows-shared-x86 | x86 | GCC | Windows |
 | dockcross/windows-shared-x64 | x86_64 | GCC | Windows |
@@ -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)
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR armv7-a)
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)

-set(cross_triple arm-linux-androideabi)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-arm64/Toolchain.cmake
+++ b/android-arm64/Toolchain.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)

-set(cross_triple aarch64-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-x86/Toolchain.cmake
+++ b/android-x86/Toolchain.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 set(CMAKE_ANDROID_ARCH_ABI x86)

-set(cross_triple i686-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-x86_64/Toolchain.cmake
+++ b/android-x86_64/Toolchain.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(CMAKE_ANDROID_ARCH_ABI x86_64)

-set(cross_triple x86_64-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/linux-arm64-full/Dockerfile.in
+++ b/linux-arm64-full/Dockerfile.in
@@ -3,7 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine

 # Buildroot version
-ENV BR_VERSION 2021.08-rc1
+# crosstool-ng master 2021-08-21
+ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01

 #include "common.buildroot"

--- a/linux-arm64-full/Toolchain.cmake
+++ b/linux-arm64-full/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)

-set(cross_triple "aarch64-buildroot-linux-gnu")
-set(cross_root /buildroot)
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
@@ -13,9 +13,8 @@ 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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

 set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)

--- a/linux-arm64-full/buildroot.config
+++ b/linux-arm64-full/buildroot.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc1-63-gf4961dea50 Configuration
+# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@@ -223,7 +223,7 @@ BR2_KERNEL_HEADERS_5_13=y
 # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set
 # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set
 BR2_KERNEL_HEADERS_LATEST=y
-BR2_DEFAULT_KERNEL_HEADERS="5.13.2"
+BR2_DEFAULT_KERNEL_HEADERS="5.13.9"
 BR2_PACKAGE_LINUX_HEADERS=y

 #
@@ -370,6 +370,7 @@ BR2_TOOLCHAIN_HAS_SYNC_4=y
 BR2_TOOLCHAIN_HAS_SYNC_8=y
 BR2_TOOLCHAIN_HAS_LIBATOMIC=y
 BR2_TOOLCHAIN_HAS_ATOMIC=y
+BR2_TOOLCHAIN_HAS_LIBQUADMATH=y

 #
 # System configuration
@@ -466,12 +467,13 @@ BR2_PACKAGE_SKELETON_INIT_NONE=y
 # BR2_PACKAGE_FAAD2 is not set
 BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y
 BR2_PACKAGE_FFMPEG=y
-# BR2_PACKAGE_FFMPEG_GPL is not set
-# BR2_PACKAGE_FFMPEG_NONFREE is not set
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_FFMPEG=y
 # BR2_PACKAGE_FFMPEG_FFPLAY is not set
 # BR2_PACKAGE_FFMPEG_FFPROBE is not set
 BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
+BR2_PACKAGE_FFMPEG_POSTPROC=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_FFMPEG_ENCODERS="all"
 BR2_PACKAGE_FFMPEG_DECODERS="all"
@@ -1479,7 +1481,6 @@ BR2_PACKAGE_LIBGPG_ERROR_SYSCFG="aarch64-unknown-linux-gnu"
 # BR2_PACKAGE_LIBGPGME is not set
 # BR2_PACKAGE_LIBKCAPI is not set
 # BR2_PACKAGE_LIBKSBA is not set
-# BR2_PACKAGE_LIBMCRYPT is not set
 # BR2_PACKAGE_LIBMHASH is not set
 # BR2_PACKAGE_LIBNSS is not set
 # BR2_PACKAGE_LIBOLM is not set
@@ -1900,7 +1901,7 @@ BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_JOSE is not set
 # BR2_PACKAGE_JSMN is not set
 # BR2_PACKAGE_JSON_C is not set
-# BR2_PACKAGE_JSON_FOR_MODERN_CPP is not set
+BR2_PACKAGE_JSON_FOR_MODERN_CPP=y
 # BR2_PACKAGE_JSON_GLIB is not set
 # BR2_PACKAGE_JSONCPP is not set
 # BR2_PACKAGE_LIBBSON is not set
@@ -2368,7 +2369,6 @@ BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y
 # BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS is not set
 # BR2_PACKAGE_HAVEGED is not set
 # BR2_PACKAGE_LINUX_SYSCALL_SUPPORT is not set
-# BR2_PACKAGE_MCRYPT is not set
 # BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO is not set
 # BR2_PACKAGE_NETDATA is not set
 # BR2_PACKAGE_PROJ is not set
@@ -2533,7 +2533,7 @@ BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y
 # BR2_PACKAGE_NETSTAT_NAT is not set

 #
-# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads, gcc >= 4.9
+# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9
 #
 # BR2_PACKAGE_NFACCT is not set
 # BR2_PACKAGE_NFTABLES is not set
@@ -2841,7 +2841,7 @@ BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y
 BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS=y

 #
-# libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12
+# libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)
 #
 # BR2_PACKAGE_LXC is not set
 BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y
@@ -3108,7 +3108,6 @@ BR2_PACKAGE_HOST_RUSTC_ARCH="aarch64"
 BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
 # BR2_PACKAGE_HOST_SAM_BA is not set
 # BR2_PACKAGE_HOST_SDBUSPLUS is not set
-# BR2_PACKAGE_HOST_SENTRY_CLI is not set
 # BR2_PACKAGE_HOST_SQUASHFS is not set
 # BR2_PACKAGE_HOST_SWIG is not set
 # BR2_PACKAGE_HOST_UBOOT_TOOLS is not set
@@ -3126,6 +3125,8 @@ BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
 #
 # Legacy options removed in 2021.08
 #
+# BR2_PACKAGE_LIBMCRYPT is not set
+# BR2_PACKAGE_MCRYPT is not set
 # BR2_PACKAGE_PHP_EXT_MCRYPT is not set
 # BR2_BINUTILS_VERSION_2_34_X is not set
 # BR2_PACKAGE_LIBSOIL is not set
--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 #include "common.crosstool"

--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/Dockerfile.in
@@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 #include "common.crosstool"

--- a/linux-armv5/Toolchain.cmake
+++ b/linux-armv5/Toolchain.cmake
@@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv5-unknown-linux-gnueabi")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv6-lts/Dockerfile.in
+++ b/linux-armv6-lts/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
--- a/linux-armv6-lts/Toolchain.cmake
+++ b/linux-armv6-lts/Toolchain.cmake
@@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv6-unknown-linux-gnueabihf")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"
--- a/linux-armv7/Toolchain.cmake
+++ b/linux-armv7/Toolchain.cmake
@@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv7-unknown-linux-gnueabi")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for 32-bit ARMv7 Linux

 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 #include "common.crosstool"

--- a/linux-armv7a/Toolchain.cmake
+++ b/linux-armv7a/Toolchain.cmake
@@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "arm-cortexa8_neon-linux-gnueabihf")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-m68k-uclibc/Dockerfile.in
+++ b/linux-m68k-uclibc/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 ARG QEMU_VERSION=6.0.0

--- a/linux-m68k-uclibc/Toolchain.cmake
+++ b/linux-m68k-uclibc/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mk68)

-set(cross_triple "m68k-unknown-uclinux-uclibc")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 #include "common.crosstool"

--- a/linux-mips/Toolchain.cmake
+++ b/linux-mips/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mips)

-set(cross_triple "mips-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 ARG QEMU_VERSION=6.0.0

--- a/linux-ppc64le/Toolchain.cmake
+++ b/linux-ppc64le/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR ppc64le)

-set(cross_triple "powerpc64le-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-riscv32/Dockerfile.in
+++ b/linux-riscv32/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 ARG QEMU_VERSION=6.0.0

--- a/linux-riscv32/Toolchain.cmake
+++ b/linux-riscv32/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv32)

-set(cross_triple "riscv32-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-riscv64/Dockerfile.in
+++ b/linux-riscv64/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 ARG QEMU_VERSION=6.0.0

--- a/linux-riscv64/Toolchain.cmake
+++ b/linux-riscv64/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv64)

-set(cross_triple "riscv64-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 #include "common.crosstool"

--- a/linux-s390x/Toolchain.cmake
+++ b/linux-s390x/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR s390x)

-set(cross_triple "s390x-ibm-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-x64-clang/Toolchain.cmake
+++ b/linux-x64-clang/Toolchain.cmake
@@ -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})
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/linux-x64-tinycc/Dockerfile.in
@@ -1,7 +1,13 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

-RUN git clone --recurse-submodules https://repo.or.cz/tinycc.git \
+# This image use Tinycc as C compiler and GCC as C++ compiler
+
+ARG REPO_URL=https://repo.or.cz/tinycc.git
+ENV REPO_URL=${REPO_URL}
+
+# Disable options: --with-libgcc --disable-static
+RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \
    && cd tinycc \
    && ./configure --cpu=x86_64 \
    && make -j$(nproc) \
@@ -9,6 +15,7 @@ RUN git clone --recurse-submodules https://repo.or.cz/tinycc.git \
    && make install

 ENV PATH="/usr/local/bin:${PATH}"
+
 # Test if compiler work
 RUN tcc -v

@@ -22,7 +29,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    LD=/usr/bin/${CROSS_TRIPLE}-ld \
    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

-
 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
--- a/linux-x64-tinycc/Toolchain.cmake
+++ b/linux-x64-tinycc/Toolchain.cmake
@@ -2,7 +2,7 @@ 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(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-x86_64-full/Dockerfile.in
+++ b/linux-x86_64-full/Dockerfile.in
@@ -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"
--- a/linux-x86_64-full/Toolchain.cmake
+++ b/linux-x86_64-full/Toolchain.cmake
@@ -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)
--- a/linux-x86_64-full/buildroot.config
+++ b/linux-x86_64-full/buildroot.config
--- a/linux-xtensa-uclibc/Dockerfile.in
+++ b/linux-xtensa-uclibc/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-07-07
-ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162

 ENV QEMU_VERSION 6.0.0

--- a/linux-xtensa-uclibc/Toolchain.cmake
+++ b/linux-xtensa-uclibc/Toolchain.cmake
@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR xtensa)

-set(cross_triple "xtensa-fsf-linux-uclibc")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/windows-arm64/Dockerfile.in
+++ b/windows-arm64/Dockerfile.in
@@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

--- a/windows-armv7/Dockerfile.in
+++ b/windows-armv7/Dockerfile.in
@@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

--- a/windows-armv7/Toolchain.cmake
+++ b/windows-armv7/Toolchain.cmake
@@ -16,4 +16,4 @@ 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_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
Author	SHA1	Message	Date
Bensuperpc	ae483711e7	Revert "Fix wrong url" This reverts commit `1d76812232`.	2021-08-21 22:53:22 +02:00
Bensuperpc	1d76812232	Fix wrong url Fix wrong url Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-21 22:38:09 +02:00
Bensuperpc	48cee95bf5	Add linux-x86_64-full and minor fix Add linux-x86_64-full and minor fix Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-21 21:09:48 +02:00
Bensuperpc	de3942966a	Merge pull request #561 from bensuperpc/Update_images Update crosstool-ng and buildroot	2021-08-21 01:13:56 +02:00
Bensuperpc	c026d14b44	Fix quadmath Fix quadmath Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-20 22:24:01 +02:00
Bensuperpc	93e73f9ead	Update ffmpeg lib and add JSON lib for C++ Update ffmpeg lib and add JSON lib for C++ Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-20 22:23:10 +02:00
Bensuperpc	2d373cc57a	Add quadmath Add quadmath Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-20 18:45:28 +02:00
Bensuperpc	6229d109ac	Update buildroot Update buildroot Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-20 18:29:26 +02:00
Bensuperpc	d68c8073fe	Update crosstool-ng Update crosstool-ng Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-20 15:37:11 +02:00
Bensuperpc	d647c82d0e	Merge pull request #560 from bensuperpc/update-images Use env variable instead hardcoded variable in toolchain.cmake and update linux-x64-tinycc image	2021-08-13 01:46:59 +02:00
Bensuperpc	c8de7138af	Update tinycc image Update tinycc image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-12 22:37:43 +02:00
Bensuperpc	5663ada809	Use env variable instead hardcoded variable in toolchain.cmake Use env variable instead hardcoded variable in toolchain.cmake Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-12 21:38:43 +02:00
Bensuperpc	95c12a3a87	Merge pull request #559 from tresf/patch-1 Remove cpp, allow gcc -E fallback	2021-08-12 02:31:50 +02:00
tresf	713ebf0491	Remove cpp from ARMv7 too	2021-08-11 15:55:51 -04:00
Tres Finocchiaro	434877cfe1	Remove cpp, allow gcc -E fallback Also switches to using mingw-w64 "familiar" suffixes	2021-08-11 15:48:36 -04:00
Bensuperpc	428fa38a94	Merge pull request #558 from bensuperpc/Update_readme_and_makefile Update Readme and Makefile	2021-08-11 18:58:01 +02:00