From 2639b3e285385a753da48c4d2b439d4a58d1d37b Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 18 May 2021 23:49:41 +0200 Subject: [PATCH] Add fixes --- .github/workflows/main.yml | 2 +- common.manylinux | 2 +- linux-armv7a/crosstool-ng.config | 9 ++++----- linux-armv8/crosstool-ng.config | 17 +++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bfab4c..7b83dcc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-20.04 strategy: fail-fast: false - max-parallel: 4 + max-parallel: 3 # manylinux2014-aarch64 cc65 pvsneslib matrix: arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6-rpi1, linux-armv7-rpi2, linux-armv6-musl, linux-armv6-rpi-old, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mips64el-n64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x64-clang, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86] diff --git a/common.manylinux b/common.manylinux index a9434ea..bb163eb 100644 --- a/common.manylinux +++ b/common.manylinux @@ -6,7 +6,7 @@ COPY \ RUN \ set -x && \ yum -y install \ - $([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "" || echo "epel-release") \ + $([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "" || echo "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm") \ gpg \ zlib-devel \ gettext \ diff --git a/linux-armv7a/crosstool-ng.config b/linux-armv7a/crosstool-ng.config index ca16362..5eb3641 100644 --- a/linux-armv7a/crosstool-ng.config +++ b/linux-armv7a/crosstool-ng.config @@ -647,7 +647,7 @@ CT_CC_GCC_ENABLE_CXX_FLAGS="" CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="" CT_CC_GCC_EXTRA_CONFIG_ARRAY="" CT_CC_GCC_STATIC_LIBSTDCXX=y -# CT_CC_GCC_SYSTEM_ZLIB is not set +CT_CC_GCC_SYSTEM_ZLIB=y CT_CC_GCC_CONFIG_TLS=m # @@ -673,7 +673,7 @@ CT_CC_CXA_ATEXIT=y # CT_CC_GCC_DISABLE_PCH is not set CT_CC_GCC_SJLJ_EXCEPTIONS=m CT_CC_GCC_LDBL_128=m -CT_CC_GCC_BUILD_ID=y +# CT_CC_GCC_BUILD_ID is not set CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y # CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set # CT_CC_GCC_LNK_HASH_STYLE_GNU is not set @@ -772,7 +772,7 @@ CT_GDB_NATIVE=y CT_GDB_GDBSERVER=y CT_GDB_NATIVE_STATIC=y CT_GDB_HAS_PKGVERSION_BUGURL=y -# CT_GDB_HAS_PYTHON is not set +CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y # CT_DEBUG_LTRACE is not set @@ -1305,6 +1305,5 @@ CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE" # # Test suite # -CT_TEST_SUITE=y -CT_TEST_SUITE_GCC=y +# CT_TEST_SUITE_GCC is not set # end of Test suite diff --git a/linux-armv8/crosstool-ng.config b/linux-armv8/crosstool-ng.config index f02b034..a1ade88 100644 --- a/linux-armv8/crosstool-ng.config +++ b/linux-armv8/crosstool-ng.config @@ -404,7 +404,9 @@ CT_BINUTILS_PLUGINS=y CT_BINUTILS_RELRO=m CT_BINUTILS_DETERMINISTIC_ARCHIVES=y CT_BINUTILS_EXTRA_CONFIG_ARRAY="" -# CT_BINUTILS_FOR_TARGET is not set +CT_BINUTILS_FOR_TARGET=y +CT_BINUTILS_FOR_TARGET_IBERTY=y +CT_BINUTILS_FOR_TARGET_BFD=y CT_ALL_BINUTILS_CHOICES="BINUTILS" # end of Binary utilities @@ -486,15 +488,15 @@ CT_GLIBC_2_14_or_later=y CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y CT_GLIBC_DEP_BINUTILS=y CT_GLIBC_DEP_GCC=y -# CT_GLIBC_DEP_PYTHON is not set +CT_GLIBC_DEP_PYTHON=y CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y -CT_GLIBC_USE_LIBIDN_ADDON=y +# CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y CT_GLIBC_EXTRA_CONFIG_ARRAY="" CT_GLIBC_CONFIGPARMS="" CT_GLIBC_EXTRA_CFLAGS="" -# CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set +CT_GLIBC_ENABLE_FORTIFIED_BUILD=y # CT_GLIBC_DISABLE_VERSIONING is not set CT_GLIBC_OLDEST_ABI="" CT_GLIBC_FORCE_UNWIND=y @@ -609,7 +611,7 @@ CT_CC_GCC_USE_LTO=y CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y CT_CC_GCC_LIBMUDFLAP=y CT_CC_GCC_LIBGOMP=y -CT_CC_GCC_LIBSSP=y +CT_CC_GCC_LIBSSP=m CT_CC_GCC_LIBQUADMATH=y CT_CC_GCC_LIBSANITIZER=y @@ -620,7 +622,7 @@ CT_CC_CXA_ATEXIT=y # CT_CC_GCC_DISABLE_PCH is not set CT_CC_GCC_SJLJ_EXCEPTIONS=m CT_CC_GCC_LDBL_128=m -CT_CC_GCC_BUILD_ID=y +# CT_CC_GCC_BUILD_ID is not set CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y # CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set # CT_CC_GCC_LNK_HASH_STYLE_GNU is not set @@ -1252,6 +1254,5 @@ CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE" # # Test suite # -CT_TEST_SUITE=y -CT_TEST_SUITE_GCC=y +# CT_TEST_SUITE_GCC is not set # end of Test suite