mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Merge branch 'master' into Add_tests
This commit is contained in:
commit
e3b41cd784
@ -3,8 +3,8 @@ FROM dockcross/base:latest
|
|||||||
# This is for 64-bit ARM Linux machine
|
# This is for 64-bit ARM Linux machine
|
||||||
|
|
||||||
# Buildroot version
|
# Buildroot version
|
||||||
# crosstool-ng master 2021-08-21
|
# buildroot master 2021-08-30
|
||||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
|
||||||
|
|
||||||
#include "common.buildroot"
|
#include "common.buildroot"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
|
# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
|
||||||
#
|
#
|
||||||
BR2_HAVE_DOT_CONFIG=y
|
BR2_HAVE_DOT_CONFIG=y
|
||||||
BR2_HOST_GCC_AT_LEAST_4_9=y
|
BR2_HOST_GCC_AT_LEAST_4_9=y
|
||||||
@ -186,6 +186,7 @@ BR2_SSP_NONE=y
|
|||||||
BR2_RELRO_NONE=y
|
BR2_RELRO_NONE=y
|
||||||
# BR2_RELRO_PARTIAL is not set
|
# BR2_RELRO_PARTIAL is not set
|
||||||
# BR2_RELRO_FULL is not set
|
# BR2_RELRO_FULL is not set
|
||||||
|
BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
|
||||||
BR2_FORTIFY_SOURCE_NONE=y
|
BR2_FORTIFY_SOURCE_NONE=y
|
||||||
# BR2_FORTIFY_SOURCE_1 is not set
|
# BR2_FORTIFY_SOURCE_1 is not set
|
||||||
# BR2_FORTIFY_SOURCE_2 is not set
|
# BR2_FORTIFY_SOURCE_2 is not set
|
||||||
@ -961,6 +962,10 @@ BR2_PACKAGE_SDL2=y
|
|||||||
# KMS/DRM video driver needs libdrm
|
# KMS/DRM video driver needs libdrm
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# OpenGL support needs X11 and an OpenGL provider
|
# OpenGL support needs X11 and an OpenGL provider
|
||||||
#
|
#
|
||||||
@ -2199,7 +2204,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
|
|||||||
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LAPACK is not set
|
# BR2_PACKAGE_LAPACK is not set
|
||||||
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LIBABSEIL_CPP is not set
|
BR2_PACKAGE_LIBABSEIL_CPP=y
|
||||||
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
||||||
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
||||||
@ -2306,7 +2311,7 @@ BR2_PACKAGE_PROTOBUF=y
|
|||||||
#
|
#
|
||||||
# BR2_PACKAGE_AUGEAS is not set
|
# BR2_PACKAGE_AUGEAS is not set
|
||||||
# BR2_PACKAGE_ENCHANT is not set
|
# BR2_PACKAGE_ENCHANT is not set
|
||||||
# BR2_PACKAGE_FMT is not set
|
BR2_PACKAGE_FMT=y
|
||||||
# BR2_PACKAGE_FSTRCMP is not set
|
# BR2_PACKAGE_FSTRCMP is not set
|
||||||
# BR2_PACKAGE_ICU is not set
|
# BR2_PACKAGE_ICU is not set
|
||||||
# BR2_PACKAGE_INIH is not set
|
# BR2_PACKAGE_INIH is not set
|
||||||
|
@ -3,8 +3,8 @@ FROM dockcross/base:latest
|
|||||||
# This is for 64-bit x86 Linux machine
|
# This is for 64-bit x86 Linux machine
|
||||||
|
|
||||||
# Buildroot version
|
# Buildroot version
|
||||||
# crosstool-ng master 2021-08-21
|
# buildroot master 2021-08-30
|
||||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
|
||||||
|
|
||||||
#include "common.buildroot"
|
#include "common.buildroot"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
|
# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
|
||||||
#
|
#
|
||||||
BR2_HAVE_DOT_CONFIG=y
|
BR2_HAVE_DOT_CONFIG=y
|
||||||
BR2_HOST_GCC_AT_LEAST_4_9=y
|
BR2_HOST_GCC_AT_LEAST_4_9=y
|
||||||
@ -147,6 +147,7 @@ BR2_SSP_NONE=y
|
|||||||
BR2_RELRO_NONE=y
|
BR2_RELRO_NONE=y
|
||||||
# BR2_RELRO_PARTIAL is not set
|
# BR2_RELRO_PARTIAL is not set
|
||||||
# BR2_RELRO_FULL is not set
|
# BR2_RELRO_FULL is not set
|
||||||
|
BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
|
||||||
BR2_FORTIFY_SOURCE_NONE=y
|
BR2_FORTIFY_SOURCE_NONE=y
|
||||||
# BR2_FORTIFY_SOURCE_1 is not set
|
# BR2_FORTIFY_SOURCE_1 is not set
|
||||||
# BR2_FORTIFY_SOURCE_2 is not set
|
# BR2_FORTIFY_SOURCE_2 is not set
|
||||||
@ -931,6 +932,10 @@ BR2_PACKAGE_SDL2=y
|
|||||||
# KMS/DRM video driver needs libdrm
|
# KMS/DRM video driver needs libdrm
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# OpenGL support needs X11 and an OpenGL provider
|
# OpenGL support needs X11 and an OpenGL provider
|
||||||
#
|
#
|
||||||
@ -2176,7 +2181,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
|
|||||||
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LAPACK is not set
|
# BR2_PACKAGE_LAPACK is not set
|
||||||
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LIBABSEIL_CPP is not set
|
BR2_PACKAGE_LIBABSEIL_CPP=y
|
||||||
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
||||||
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
||||||
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
||||||
@ -2284,7 +2289,7 @@ BR2_PACKAGE_PROTOBUF=y
|
|||||||
#
|
#
|
||||||
# BR2_PACKAGE_AUGEAS is not set
|
# BR2_PACKAGE_AUGEAS is not set
|
||||||
# BR2_PACKAGE_ENCHANT is not set
|
# BR2_PACKAGE_ENCHANT is not set
|
||||||
# BR2_PACKAGE_FMT is not set
|
BR2_PACKAGE_FMT=y
|
||||||
# BR2_PACKAGE_FSTRCMP is not set
|
# BR2_PACKAGE_FSTRCMP is not set
|
||||||
# BR2_PACKAGE_ICU is not set
|
# BR2_PACKAGE_ICU is not set
|
||||||
# BR2_PACKAGE_INIH is not set
|
# BR2_PACKAGE_INIH is not set
|
||||||
|
Loading…
Reference in New Issue
Block a user