From e09d3f85bf460b5c8b011ab899db666bf10af3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Thu, 14 Sep 2023 21:37:24 +0200 Subject: [PATCH 1/3] bump arm-unknown-linux-gnueabihf to glibc 2.31 --- .changes/1333.json | 4 ++++ README.md | 2 +- .../arm-unknown-linux-gnueabihf.config | 19 ++----------------- 3 files changed, 7 insertions(+), 18 deletions(-) create mode 100644 .changes/1333.json diff --git a/.changes/1333.json b/.changes/1333.json new file mode 100644 index 000000000..d9353285e --- /dev/null +++ b/.changes/1333.json @@ -0,0 +1,4 @@ +{ + "description": "set arm-unknown-linux-gnueabihf to use glibc 2.31", + "type": "changed" +} diff --git a/README.md b/README.md index 468ba1c37..68af0ca4e 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,7 @@ terminate. | `aarch64-unknown-linux-musl` | 1.1.24 | 9.2.0 | ✓ | 6.1.0 | ✓ | | `arm-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ | | `arm-unknown-linux-gnueabi` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ | -| `arm-unknown-linux-gnueabihf` | 2.17 | 8.3.0 | ✓ | 6.1.0 | ✓ | +| `arm-unknown-linux-gnueabihf` | 2.31 | 8.3.0 | ✓ | 6.1.0 | ✓ | | `arm-unknown-linux-musleabi` | 1.1.24 | 9.2.0 | ✓ | 6.1.0 | ✓ | | `arm-unknown-linux-musleabihf` | 1.1.24 | 9.2.0 | ✓ | 6.1.0 | ✓ | | `armv5te-unknown-linux-gnueabi` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ | diff --git a/docker/crosstool-config/arm-unknown-linux-gnueabihf.config b/docker/crosstool-config/arm-unknown-linux-gnueabihf.config index e8988f469..e88ca78c6 100644 --- a/docker/crosstool-config/arm-unknown-linux-gnueabihf.config +++ b/docker/crosstool-config/arm-unknown-linux-gnueabihf.config @@ -365,30 +365,15 @@ CT_GLIBC_USE="GLIBC" CT_GLIBC_PKG_NAME="glibc" CT_GLIBC_SRC_RELEASE=y CT_GLIBC_PATCH_ORDER="global" -CT_GLIBC_V_2_17=y +CT_GLIBC_V_2_31=y # CT_GLIBC_NO_VERSIONS is not set -CT_GLIBC_VERSION="2.17" +CT_GLIBC_VERSION="2.31" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" -CT_GLIBC_2_29_or_older=y -CT_GLIBC_older_than_2_29=y -CT_GLIBC_2_27_or_older=y -CT_GLIBC_older_than_2_27=y -CT_GLIBC_2_26_or_older=y -CT_GLIBC_older_than_2_26=y -CT_GLIBC_2_25_or_older=y -CT_GLIBC_older_than_2_25=y -CT_GLIBC_2_24_or_older=y -CT_GLIBC_older_than_2_24=y -CT_GLIBC_2_23_or_older=y -CT_GLIBC_older_than_2_23=y -CT_GLIBC_2_20_or_older=y -CT_GLIBC_older_than_2_20=y CT_GLIBC_2_17_or_later=y -CT_GLIBC_2_17_or_older=y CT_GLIBC_later_than_2_14=y CT_GLIBC_2_14_or_later=y CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y From e207b6f6d8ef6f8c2196ed9255ebd4fe9e873b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Fri, 15 Sep 2023 00:47:01 +0200 Subject: [PATCH 2/3] try more correct config --- .../arm-unknown-linux-gnueabihf.config | 87 +++++++++++++++---- 1 file changed, 72 insertions(+), 15 deletions(-) diff --git a/docker/crosstool-config/arm-unknown-linux-gnueabihf.config b/docker/crosstool-config/arm-unknown-linux-gnueabihf.config index e88ca78c6..883dc2821 100644 --- a/docker/crosstool-config/arm-unknown-linux-gnueabihf.config +++ b/docker/crosstool-config/arm-unknown-linux-gnueabihf.config @@ -361,18 +361,58 @@ CT_LIBC_GLIBC_SHOW=y CT_LIBC_GLIBC_PKG_KSYM="GLIBC" CT_GLIBC_DIR_NAME="glibc" CT_GLIBC_USE_GNU=y +# CT_GLIBC_USE_ORACLE is not set CT_GLIBC_USE="GLIBC" CT_GLIBC_PKG_NAME="glibc" CT_GLIBC_SRC_RELEASE=y +# CT_GLIBC_SRC_DEVEL is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_35 is not set +# CT_GLIBC_V_2_34 is not set +# CT_GLIBC_V_2_33 is not set +# CT_GLIBC_V_2_32 is not set CT_GLIBC_V_2_31=y -# CT_GLIBC_NO_VERSIONS is not set +# CT_GLIBC_V_2_30 is not set +# CT_GLIBC_V_2_29 is not set +# CT_GLIBC_V_2_28 is not set +# CT_GLIBC_V_2_27 is not set +# CT_GLIBC_V_2_26 is not set +# CT_GLIBC_V_2_25 is not set +# CT_GLIBC_V_2_24 is not set +# CT_GLIBC_V_2_23 is not set +# CT_GLIBC_V_2_19 is not set +# CT_GLIBC_V_2_17 is not set CT_GLIBC_VERSION="2.31" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" +CT_GLIBC_2_34_or_older=y +CT_GLIBC_older_than_2_34=y +CT_GLIBC_2_32_or_older=y +CT_GLIBC_older_than_2_32=y +CT_GLIBC_2_31_or_later=y +CT_GLIBC_2_31_or_older=y +CT_GLIBC_later_than_2_30=y +CT_GLIBC_2_30_or_later=y +CT_GLIBC_later_than_2_29=y +CT_GLIBC_2_29_or_later=y +CT_GLIBC_later_than_2_28=y +CT_GLIBC_2_28_or_later=y +CT_GLIBC_later_than_2_27=y +CT_GLIBC_2_27_or_later=y +CT_GLIBC_later_than_2_26=y +CT_GLIBC_2_26_or_later=y +CT_GLIBC_later_than_2_25=y +CT_GLIBC_2_25_or_later=y +CT_GLIBC_later_than_2_24=y +CT_GLIBC_2_24_or_later=y +CT_GLIBC_later_than_2_23=y +CT_GLIBC_2_23_or_later=y +CT_GLIBC_later_than_2_20=y +CT_GLIBC_2_20_or_later=y +CT_GLIBC_later_than_2_17=y CT_GLIBC_2_17_or_later=y CT_GLIBC_later_than_2_14=y CT_GLIBC_2_14_or_later=y @@ -380,12 +420,10 @@ CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y CT_GLIBC_DEP_BINUTILS=y CT_GLIBC_DEP_GCC=y CT_GLIBC_DEP_PYTHON=y -CT_GLIBC_HAS_NPTL_ADDON=y -CT_GLIBC_HAS_PORTS_ADDON=y +CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y -CT_GLIBC_USE_PORTS_ADDON=y -CT_GLIBC_USE_NPTL_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set +CT_GLIBC_NO_SPARC_V8=y CT_GLIBC_HAS_OBSOLETE_RPC=y CT_GLIBC_EXTRA_CONFIG_ARRAY="" CT_GLIBC_CONFIGPARMS="" @@ -398,8 +436,15 @@ CT_GLIBC_FORCE_UNWIND=y # CT_GLIBC_KERNEL_VERSION_NONE is not set CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_GLIBC_KERNEL_VERSION_CHOSEN is not set -CT_GLIBC_MIN_KERNEL="3.2.101" -CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" +CT_GLIBC_MIN_KERNEL="4.19.229" +CT_GLIBC_SSP_DEFAULT=y +# CT_GLIBC_SSP_NO is not set +# CT_GLIBC_SSP_YES is not set +# CT_GLIBC_SSP_ALL is not set +# CT_GLIBC_SSP_STRONG is not set +CT_GLIBC_ENABLE_WERROR=y +# CT_GLIBC_ENABLE_COMMON_FLAG is not set +CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -409,13 +454,12 @@ CT_LIBC_SUPPORT_THREADS_NATIVE=y CT_THREADS_NATIVE=y # CT_CREATE_LDSO_CONF is not set CT_LIBC_XLDD=y +# end of C-library # # C compiler # -CT_CC_CORE_PASSES_NEEDED=y -CT_CC_CORE_PASS_1_NEEDED=y -CT_CC_CORE_PASS_2_NEEDED=y +CT_CC_CORE_NEEDED=y CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y @@ -436,30 +480,43 @@ CT_GCC_USE_GNU=y CT_GCC_USE="GCC" CT_GCC_PKG_NAME="gcc" CT_GCC_SRC_RELEASE=y +# CT_GCC_SRC_DEVEL is not set CT_GCC_PATCH_ORDER="global" +# CT_GCC_V_11 is not set +# CT_GCC_V_10 is not set +# CT_GCC_V_9 is not set CT_GCC_V_8=y -# CT_GCC_NO_VERSIONS is not set -CT_GCC_VERSION="8.3.0" +# CT_GCC_V_7 is not set +# CT_GCC_V_6 is not set +CT_GCC_VERSION="8.5.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_11_or_older=y +CT_GCC_older_than_11=y +CT_GCC_10_or_older=y +CT_GCC_older_than_10=y +CT_GCC_9_or_older=y +CT_GCC_older_than_9=y +CT_GCC_later_than_8=y +CT_GCC_8_or_later=y CT_GCC_later_than_7=y CT_GCC_7_or_later=y CT_GCC_later_than_6=y CT_GCC_6_or_later=y +CT_GCC_REQUIRE_6_or_later=y CT_GCC_later_than_5=y CT_GCC_5_or_later=y +CT_GCC_REQUIRE_5_or_later=y CT_GCC_later_than_4_9=y CT_GCC_4_9_or_later=y -CT_GCC_later_than_4_8=y -CT_GCC_4_8_or_later=y +CT_GCC_REQUIRE_4_9_or_later=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="" -CT_CC_GCC_STATIC_LIBSTDCXX=y # CT_CC_GCC_SYSTEM_ZLIB is not set CT_CC_GCC_CONFIG_TLS=m From ed5262847eb04bf319e8d790c28dac832f234330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Fri, 15 Sep 2023 08:49:44 +0200 Subject: [PATCH 3/3] bump build timeout --- docker/crosstool-ng.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/crosstool-ng.sh b/docker/crosstool-ng.sh index 6c76bd01c..5e96540df 100755 --- a/docker/crosstool-ng.sh +++ b/docker/crosstool-ng.sh @@ -25,7 +25,7 @@ main() { local srcdir="/home/${username}/src" local dstdir="/x-tools" local sleep=15s - local timeout=5m + local timeout=10m install_packages autoconf \ bison \