From b6b1d68d83c6d4c6145bf7549a6d2538f6e28d09 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 23 Oct 2022 19:20:49 +0200 Subject: [PATCH] Revert "Bump linux64 minimum toolchain version" This reverts commit 37f2a44634c75a60b4380794ccbe4e8457df3c8a. --- README.md | 6 +++-- images/base-linux64/ct-ng-config | 43 +++++++++++++------------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 19f501e..e4a98cb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ Static Windows (x86_64) and Linux (x86_64) Builds of ffmpeg master and latest re Windows builds are targetting Windows 7 and newer. -Linux builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent. +Linux (x86_64) builds are targetting Ubuntu 16.04 (glibc-2.23 + linux-4.4) and anything more recent. + +Linux (arm64) builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent. ## Auto-Builds @@ -45,7 +47,7 @@ On success, the resulting zip file will be in the `artifacts` subdir. Available targets: * `win64` (x86_64 Windows) * `win32` (x86 Windows) -* `linux64` (x86_64 Linux, glibc>=2.27, linux>=4.15) +* `linux64` (x86_64 Linux, glibc>=2.23, linux>=4.4) * `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15) The linuxarm64 target will not build some dependencies due to lack of arm64 (aarch64) architecture support or cross-compiling restrictions. diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index 0f164fe..dbb6f81 100644 --- a/images/base-linux64/ct-ng-config +++ b/images/base-linux64/ct-ng-config @@ -292,14 +292,14 @@ CT_LINUX_PATCH_ORDER="global" # CT_LINUX_V_4_18 is not set # CT_LINUX_V_4_17 is not set # CT_LINUX_V_4_16 is not set -CT_LINUX_V_4_15=y +# CT_LINUX_V_4_15 is not set # CT_LINUX_V_4_14 is not set # CT_LINUX_V_4_13 is not set # CT_LINUX_V_4_12 is not set # CT_LINUX_V_4_11 is not set # CT_LINUX_V_4_10 is not set # CT_LINUX_V_4_9 is not set -# CT_LINUX_V_4_4 is not set +CT_LINUX_V_4_4=y # CT_LINUX_V_4_1 is not set # CT_LINUX_V_3_18 is not set # CT_LINUX_V_3_16 is not set @@ -308,7 +308,8 @@ CT_LINUX_V_4_15=y # CT_LINUX_V_3_10 is not set # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set -CT_LINUX_VERSION="4.15.18" +# CT_LINUX_V_2_6_32 is not set +CT_LINUX_VERSION="4.4.302" CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -322,13 +323,12 @@ CT_LINUX_5_5_or_older=y CT_LINUX_older_than_5_5=y CT_LINUX_5_3_or_older=y CT_LINUX_older_than_5_3=y -CT_LINUX_later_than_4_8=y -CT_LINUX_4_8_or_later=y +CT_LINUX_4_8_or_older=y +CT_LINUX_older_than_4_8=y CT_LINUX_later_than_3_7=y CT_LINUX_3_7_or_later=y CT_LINUX_later_than_3_2=y CT_LINUX_3_2_or_later=y -CT_LINUX_REQUIRE_3_2_or_later=y CT_KERNEL_DEP_RSYNC=y CT_KERNEL_LINUX_VERBOSITY_0=y # CT_KERNEL_LINUX_VERBOSITY_1 is not set @@ -457,14 +457,14 @@ CT_GLIBC_PATCH_ORDER="global" # 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=y +# 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_23=y # CT_GLIBC_V_2_19 is not set # CT_GLIBC_V_2_17 is not set -CT_GLIBC_VERSION="2.27" +CT_GLIBC_VERSION="2.23" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -484,16 +484,16 @@ CT_GLIBC_2_29_or_older=y CT_GLIBC_older_than_2_29=y CT_GLIBC_2_28_or_older=y CT_GLIBC_older_than_2_28=y -CT_GLIBC_2_27_or_later=y CT_GLIBC_2_27_or_older=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_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_later=y +CT_GLIBC_2_23_or_older=y CT_GLIBC_later_than_2_20=y CT_GLIBC_2_20_or_later=y CT_GLIBC_later_than_2_17=y @@ -506,7 +506,6 @@ CT_GLIBC_DEP_GCC=y CT_GLIBC_DEP_PYTHON=y CT_GLIBC_SPARC_ALLOW_V7=y CT_THREADS="nptl" -CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y @@ -524,12 +523,7 @@ 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="4.15.18" -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_MIN_KERNEL="4.4.302" CT_GLIBC_ENABLE_COMMON_FLAG=y CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y @@ -612,7 +606,6 @@ CT_GCC_later_than_5=y CT_GCC_5_or_later=y CT_GCC_later_than_4_9=y CT_GCC_4_9_or_later=y -CT_GCC_REQUIRE_4_9_or_later=y CT_CC_GCC_ENABLE_PLUGINS=y CT_CC_GCC_HAS_LIBMPX=y CT_CC_GCC_ENABLE_CXX_FLAGS=""