From fd1fa825b7625c30ccb45a655b20bb1a081e6846 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 25 Jun 2021 13:06:22 +0200 Subject: [PATCH] FIx build fail on linux-armv7a image Switch to GCC 7.3.0 non-linaro, update GLIBC to 2.27 ect... Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 1 + linux-armv7a/crosstool-ng.config | 43 +++++++++++--------------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb000ec..f5615fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - '*' + jobs: base: name: base diff --git a/linux-armv7a/crosstool-ng.config b/linux-armv7a/crosstool-ng.config index e8d5b27..969b3b0 100644 --- a/linux-armv7a/crosstool-ng.config +++ b/linux-armv7a/crosstool-ng.config @@ -11,9 +11,7 @@ CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y CT_CONFIGURE_has_autoconf_2_63_or_newer=y CT_CONFIGURE_has_autoreconf_2_63_or_newer=y -CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y -CT_CONFIGURE_has_svn=y CT_CONFIGURE_has_git=y CT_MODULES=y @@ -74,7 +72,7 @@ CT_PATCH_ORDER="bundled" # # Build behavior # -CT_PARALLEL_JOBS=0 +CT_PARALLEL_JOBS=4 CT_LOAD="" CT_USE_PIPES=y CT_EXTRA_CFLAGS_FOR_BUILD="" @@ -235,14 +233,14 @@ CT_TOOLCHAIN_ENABLE_NLS=y # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="4.9.36" +CT_KERNEL_VERSION="4.10.8" # CT_KERNEL_bare_metal is not set CT_KERNEL_linux=y CT_KERNEL_bare_metal_AVAILABLE=y CT_KERNEL_linux_AVAILABLE=y # CT_KERNEL_LINUX_CUSTOM is not set -#CT_KERNEL_V_4_10=y -CT_KERNEL_V_4_9=y +CT_KERNEL_V_4_10=y +# CT_KERNEL_V_4_9 is not set # CT_KERNEL_V_4_4 is not set # CT_KERNEL_V_4_1 is not set # CT_KERNEL_V_3_16 is not set @@ -316,17 +314,15 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY="" # C-library # CT_LIBC="glibc" -CT_LIBC_VERSION="2.24" +CT_LIBC_VERSION="2.27" CT_LIBC_glibc=y -# CT_LIBC_musl is not set # CT_LIBC_uClibc is not set CT_LIBC_avr_libc_AVAILABLE=y CT_LIBC_glibc_AVAILABLE=y CT_THREADS="nptl" -# CT_LIBC_GLIBC_CUSTOM is not set -# CT_CC_GLIBC_SHOW_LINARO is not set -#CT_LIBC_GLIBC_V_2_25=y -CT_LIBC_GLIBC_V_2_24=y +CT_CC_GLIBC_SHOW_LINARO=y +# CT_LIBC_GLIBC_V_2_25 is not set +# CT_LIBC_GLIBC_V_2_24 is not set # CT_LIBC_GLIBC_V_2_23 is not set CT_LIBC_GLIBC_2_23_or_later=y CT_LIBC_GLIBC_2_20_or_later=y @@ -409,14 +405,10 @@ CT_CC_CORE_PASSES_NEEDED=y CT_CC_CORE_PASS_1_NEEDED=y CT_CC_CORE_PASS_2_NEEDED=y CT_CC_gcc=y -# CT_CC_GCC_CUSTOM is not set -CT_CC_GCC_VERSION="linaro-6.3-2017.02" -CT_CC_GCC_SHOW_LINARO=y -CT_CC_GCC_V_linaro_6_3=y -# CT_CC_GCC_V_6_3_0 is not set -# CT_CC_GCC_V_linaro_5_4 is not set +CT_CC_GCC_VERSION="7.3.0" +# CT_CC_GCC_SHOW_LINARO is not set +CT_CC_GCC_V_6_3_0=y # CT_CC_GCC_V_5_4_0 is not set -# CT_CC_GCC_V_linaro_4_9 is not set # CT_CC_GCC_V_4_9_4 is not set CT_CC_GCC_4_8_or_later=y CT_CC_GCC_4_9_or_later=y @@ -425,7 +417,6 @@ CT_CC_GCC_6=y CT_CC_GCC_6_or_later=y CT_CC_GCC_ENABLE_PLUGINS=y CT_CC_GCC_GOLD=y -CT_CC_GCC_HAS_LIBMPX=y CT_CC_GCC_ENABLE_CXX_FLAGS="" CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="" CT_CC_GCC_EXTRA_CONFIG_ARRAY="" @@ -478,13 +469,8 @@ CT_CC_SUPPORT_GOLANG=y # Additional supported languages: # CT_CC_LANG_CXX=y -# CT_CC_LANG_FORTRAN is not set +CT_CC_LANG_FORTRAN=y # CT_CC_LANG_JAVA is not set -# CT_CC_LANG_ADA is not set -# CT_CC_LANG_OBJC is not set -# CT_CC_LANG_OBJCXX is not set -# CT_CC_LANG_GOLANG is not set -CT_CC_LANG_OTHERS="" # # Debug facilities @@ -506,9 +492,8 @@ CT_GDB_GDBSERVER_HAS_IPA_LIB=y # # gdb version # -# CT_GDB_CUSTOM is not set -CT_GDB_VERSION="7.12.1" -CT_GDB_V_7_12_1=y +CT_GDB_VERSION="8.1" +# CT_GDB_V_7_12_1 is not set # CT_GDB_V_7_11_1 is not set CT_GDB_7_12_or_later=y CT_GDB_7_2_or_later=y