diff --git a/README.md b/README.md index 0185e90..de17f65 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,7 @@ Static Windows (x86_64) and Linux (x86_64) Builds of ffmpeg master and latest re Windows builds are targetting Windows 7 and newer. -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. +Linux builds are targetting RHEL/CentOS 8 (glibc-2.28 + linux-4.18) and anything more recent. ## Auto-Builds @@ -47,8 +45,8 @@ 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.23, linux>=4.4) -* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15) +* `linux64` (x86_64 Linux, glibc>=2.28, linux>=4.18) +* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.28, linux>=4.18) 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 5ac75e3..64078f1 100644 --- a/images/base-linux64/ct-ng-config +++ b/images/base-linux64/ct-ng-config @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.232_c175b21 Configuration +# crosstool-NG 1.26.0.65_ecc5e41 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_rsync=y +CT_CONFIGURE_has_meson=y +CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y @@ -26,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.232_c175b21" +CT_VERSION="1.26.0.65_ecc5e41" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -145,6 +146,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -253,9 +255,6 @@ CT_KERNEL_LINUX_SHOW=y # CT_KERNEL_LINUX_PKG_KSYM="LINUX" CT_LINUX_DIR_NAME="linux" -CT_LINUX_USE_WWW_KERNEL_ORG=y -# CT_LINUX_USE_ORACLE is not set -CT_LINUX_USE="LINUX" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y # CT_LINUX_SRC_DEVEL is not set @@ -267,6 +266,8 @@ CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_LOCAL_BUNDLED is not set # CT_LINUX_PATCH_NONE is not set CT_LINUX_PATCH_ORDER="global" +# CT_LINUX_V_6_6 is not set +# CT_LINUX_V_6_5 is not set # CT_LINUX_V_6_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set @@ -293,7 +294,7 @@ CT_LINUX_PATCH_ORDER="global" # CT_LINUX_V_5_0 is not set # CT_LINUX_V_4_20 is not set # CT_LINUX_V_4_19 is not set -# CT_LINUX_V_4_18 is not set +CT_LINUX_V_4_18=y # CT_LINUX_V_4_17 is not set # CT_LINUX_V_4_16 is not set # CT_LINUX_V_4_15 is not set @@ -303,7 +304,7 @@ CT_LINUX_PATCH_ORDER="global" # 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=y +# CT_LINUX_V_4_4 is not set # CT_LINUX_V_4_1 is not set # CT_LINUX_V_3_18 is not set # CT_LINUX_V_3_16 is not set @@ -312,8 +313,7 @@ CT_LINUX_V_4_4=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_V_2_6_32 is not set -CT_LINUX_VERSION="4.4.302" +CT_LINUX_VERSION="4.18.20" 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}" @@ -327,12 +327,14 @@ 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_4_8_or_older=y -CT_LINUX_older_than_4_8=y +CT_LINUX_later_than_4_8=y +CT_LINUX_4_8_or_later=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_has_rsync=y CT_KERNEL_DEP_RSYNC=y CT_KERNEL_LINUX_VERBOSITY_0=y # CT_KERNEL_LINUX_VERBOSITY_1 is not set @@ -376,7 +378,9 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_40=y +CT_BINUTILS_V_2_42=y +# CT_BINUTILS_V_2_41 is not set +# CT_BINUTILS_V_2_40 is not set # CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set @@ -391,7 +395,7 @@ CT_BINUTILS_V_2_40=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.40" +CT_BINUTILS_VERSION="2.42" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -453,6 +457,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set @@ -463,15 +468,15 @@ CT_GLIBC_PATCH_ORDER="global" # CT_GLIBC_V_2_31 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_28=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=y +# 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.23" +CT_GLIBC_VERSION="2.28" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -493,18 +498,18 @@ CT_GLIBC_2_30_or_older=y CT_GLIBC_older_than_2_30=y CT_GLIBC_2_29_or_older=y CT_GLIBC_older_than_2_29=y +CT_GLIBC_2_28_or_later=y CT_GLIBC_2_28_or_older=y -CT_GLIBC_older_than_2_28=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_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_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 @@ -517,6 +522,7 @@ 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 @@ -534,7 +540,13 @@ 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.4.302" +CT_GLIBC_MIN_KERNEL="4.18.20" +# CT_GLIBC_SSP_DEFAULT is not set +# 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=y +CT_GLIBC_SSP="strong" CT_GLIBC_ENABLE_COMMON_FLAG=y CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y @@ -621,6 +633,7 @@ 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="" @@ -787,7 +800,6 @@ CT_ISL_V_0_26=y # CT_ISL_V_0_17 is not set # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set -# CT_ISL_V_0_11 is not set CT_ISL_VERSION="0.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -835,10 +847,9 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_LOCAL_BUNDLED is not set # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" -CT_MPC_V_1_2=y -# CT_MPC_V_1_1 is not set -# CT_MPC_V_1_0 is not set -CT_MPC_VERSION="1.2.1" +CT_MPC_V_1_3=y +# CT_MPC_V_1_2 is not set +CT_MPC_VERSION="1.3.1" CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -861,9 +872,6 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" CT_MPFR_V_4_2=y -# CT_MPFR_V_4_1 is not set -# CT_MPFR_V_4_0 is not set -# CT_MPFR_V_3_1 is not set CT_MPFR_VERSION="4.2.1" CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -917,9 +925,9 @@ CT_ZLIB_PATCH_GLOBAL=y # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set # CT_ZLIB_PATCH_NONE is not set CT_ZLIB_PATCH_ORDER="global" -CT_ZLIB_V_1_2_13=y -# CT_ZLIB_V_1_2_12 is not set -CT_ZLIB_VERSION="1.2.13" +CT_ZLIB_V_1_3=y +# CT_ZLIB_V_1_2_13 is not set +CT_ZLIB_VERSION="1.3" CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config index 939ed8c..f3f768a 100644 --- a/images/base-linuxarm64/ct-ng-config +++ b/images/base-linuxarm64/ct-ng-config @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.232_c175b21 Configuration +# crosstool-NG 1.26.0.65_ecc5e41 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_rsync=y +CT_CONFIGURE_has_meson=y +CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y @@ -26,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.232_c175b21" +CT_VERSION="1.26.0.65_ecc5e41" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -145,6 +146,7 @@ CT_ARCH_ARM=y # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set @@ -163,7 +165,7 @@ CT_ARCH_ARM_SHOW=y # Options for arm # CT_ARCH_ARM_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -260,9 +262,6 @@ CT_KERNEL_LINUX_SHOW=y # CT_KERNEL_LINUX_PKG_KSYM="LINUX" CT_LINUX_DIR_NAME="linux" -CT_LINUX_USE_WWW_KERNEL_ORG=y -# CT_LINUX_USE_ORACLE is not set -CT_LINUX_USE="LINUX" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y # CT_LINUX_SRC_DEVEL is not set @@ -274,6 +273,8 @@ CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_LOCAL_BUNDLED is not set # CT_LINUX_PATCH_NONE is not set CT_LINUX_PATCH_ORDER="global" +# CT_LINUX_V_6_6 is not set +# CT_LINUX_V_6_5 is not set # CT_LINUX_V_6_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set @@ -300,10 +301,10 @@ CT_LINUX_PATCH_ORDER="global" # CT_LINUX_V_5_0 is not set # CT_LINUX_V_4_20 is not set # CT_LINUX_V_4_19 is not set -# CT_LINUX_V_4_18 is not set +CT_LINUX_V_4_18=y # 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 @@ -317,7 +318,7 @@ CT_LINUX_V_4_15=y # CT_LINUX_V_3_13 is not set # CT_LINUX_V_3_12 is not set # CT_LINUX_V_3_10 is not set -CT_LINUX_VERSION="4.15.18" +CT_LINUX_VERSION="4.18.20" 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}" @@ -339,6 +340,7 @@ CT_LINUX_REQUIRE_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_has_rsync=y CT_KERNEL_DEP_RSYNC=y CT_KERNEL_LINUX_VERBOSITY_0=y # CT_KERNEL_LINUX_VERBOSITY_1 is not set @@ -382,7 +384,9 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_40=y +CT_BINUTILS_V_2_42=y +# CT_BINUTILS_V_2_41 is not set +# CT_BINUTILS_V_2_40 is not set # CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set @@ -397,7 +401,7 @@ CT_BINUTILS_V_2_40=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.40" +CT_BINUTILS_VERSION="2.42" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -459,6 +463,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set @@ -469,15 +474,15 @@ CT_GLIBC_PATCH_ORDER="global" # CT_GLIBC_V_2_31 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=y +CT_GLIBC_V_2_28=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_19 is not set # CT_GLIBC_V_2_17 is not set -CT_GLIBC_VERSION="2.27" +CT_GLIBC_VERSION="2.28" CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)" CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -499,10 +504,10 @@ CT_GLIBC_2_30_or_older=y CT_GLIBC_older_than_2_30=y CT_GLIBC_2_29_or_older=y CT_GLIBC_older_than_2_29=y +CT_GLIBC_2_28_or_later=y CT_GLIBC_2_28_or_older=y -CT_GLIBC_older_than_2_28=y +CT_GLIBC_later_than_2_27=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 @@ -541,7 +546,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_MIN_KERNEL="4.18.20" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set @@ -799,7 +804,6 @@ CT_ISL_V_0_26=y # CT_ISL_V_0_17 is not set # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set -# CT_ISL_V_0_11 is not set CT_ISL_VERSION="0.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -847,10 +851,9 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_LOCAL_BUNDLED is not set # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" -CT_MPC_V_1_2=y -# CT_MPC_V_1_1 is not set -# CT_MPC_V_1_0 is not set -CT_MPC_VERSION="1.2.1" +CT_MPC_V_1_3=y +# CT_MPC_V_1_2 is not set +CT_MPC_VERSION="1.3.1" CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -873,9 +876,6 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" CT_MPFR_V_4_2=y -# CT_MPFR_V_4_1 is not set -# CT_MPFR_V_4_0 is not set -# CT_MPFR_V_3_1 is not set CT_MPFR_VERSION="4.2.1" CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -929,9 +929,9 @@ CT_ZLIB_PATCH_GLOBAL=y # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set # CT_ZLIB_PATCH_NONE is not set CT_ZLIB_PATCH_ORDER="global" -CT_ZLIB_V_1_2_13=y -# CT_ZLIB_V_1_2_12 is not set -CT_ZLIB_VERSION="1.2.13" +CT_ZLIB_V_1_3=y +# CT_ZLIB_V_1_2_13 is not set +CT_ZLIB_VERSION="1.3" CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 2b6fd5b..ba0c46d 100644 --- a/images/base-win32/ct-ng-config +++ b/images/base-win32/ct-ng-config @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.232_c175b21 Configuration +# crosstool-NG 1.26.0.65_ecc5e41 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_rsync=y +CT_CONFIGURE_has_meson=y +CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y @@ -26,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.232_c175b21" +CT_VERSION="1.26.0.65_ecc5e41" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -145,6 +146,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -293,7 +295,9 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_40=y +CT_BINUTILS_V_2_42=y +# CT_BINUTILS_V_2_41 is not set +# CT_BINUTILS_V_2_40 is not set # CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set @@ -308,7 +312,7 @@ CT_BINUTILS_V_2_40=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.40" +CT_BINUTILS_VERSION="2.42" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -366,14 +370,15 @@ CT_MINGW_W64_PATCH_GLOBAL=y # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set # CT_MINGW_W64_PATCH_NONE is not set CT_MINGW_W64_PATCH_ORDER="global" -CT_MINGW_W64_V_V10_0=y +CT_MINGW_W64_V_V11_0=y +# CT_MINGW_W64_V_V10_0 is not set # CT_MINGW_W64_V_V9_0 is not set # CT_MINGW_W64_V_V8_0 is not set # CT_MINGW_W64_V_V7_0 is not set # CT_MINGW_W64_V_V6_0 is not set # CT_MINGW_W64_V_V5_0 is not set # CT_MINGW_W64_V_V4_0 is not set -CT_MINGW_W64_VERSION="v10.0.0" +CT_MINGW_W64_VERSION="v11.0.1" CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/" CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -664,8 +669,8 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_LOCAL_BUNDLED is not set # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" -CT_MPC_V_1_2=y -CT_MPC_VERSION="1.2.1" +CT_MPC_V_1_3=y +CT_MPC_VERSION="1.3.1" CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -711,8 +716,9 @@ CT_ZLIB_PATCH_GLOBAL=y # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set # CT_ZLIB_PATCH_NONE is not set CT_ZLIB_PATCH_ORDER="global" -CT_ZLIB_V_1_2_13=y -CT_ZLIB_VERSION="1.2.13" +CT_ZLIB_V_1_3=y +# CT_ZLIB_V_1_2_13 is not set +CT_ZLIB_VERSION="1.3" CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index d388a1d..df935b4 100644 --- a/images/base-win64/ct-ng-config +++ b/images/base-win64/ct-ng-config @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.232_c175b21 Configuration +# crosstool-NG 1.26.0.65_ecc5e41 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_rsync=y +CT_CONFIGURE_has_meson=y +CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y @@ -26,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.232_c175b21" +CT_VERSION="1.26.0.65_ecc5e41" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -145,6 +146,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -293,7 +295,9 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_40=y +CT_BINUTILS_V_2_42=y +# CT_BINUTILS_V_2_41 is not set +# CT_BINUTILS_V_2_40 is not set # CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set @@ -308,7 +312,7 @@ CT_BINUTILS_V_2_40=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.40" +CT_BINUTILS_VERSION="2.42" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -366,14 +370,15 @@ CT_MINGW_W64_PATCH_GLOBAL=y # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set # CT_MINGW_W64_PATCH_NONE is not set CT_MINGW_W64_PATCH_ORDER="global" -CT_MINGW_W64_V_V10_0=y +CT_MINGW_W64_V_V11_0=y +# CT_MINGW_W64_V_V10_0 is not set # CT_MINGW_W64_V_V9_0 is not set # CT_MINGW_W64_V_V8_0 is not set # CT_MINGW_W64_V_V7_0 is not set # CT_MINGW_W64_V_V6_0 is not set # CT_MINGW_W64_V_V5_0 is not set # CT_MINGW_W64_V_V4_0 is not set -CT_MINGW_W64_VERSION="v10.0.0" +CT_MINGW_W64_VERSION="v11.0.1" CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/" CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -664,8 +669,8 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_LOCAL_BUNDLED is not set # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" -CT_MPC_V_1_2=y -CT_MPC_VERSION="1.2.1" +CT_MPC_V_1_3=y +CT_MPC_VERSION="1.3.1" CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -711,8 +716,9 @@ CT_ZLIB_PATCH_GLOBAL=y # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set # CT_ZLIB_PATCH_NONE is not set CT_ZLIB_PATCH_ORDER="global" -CT_ZLIB_V_1_2_13=y -CT_ZLIB_VERSION="1.2.13" +CT_ZLIB_V_1_3=y +# CT_ZLIB_V_1_2_13 is not set +CT_ZLIB_VERSION="1.3" CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 013bde2..b9c57c4 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:23.10 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive RUN \ apt-get -y update && \ apt-get -y dist-upgrade && \ apt-get -y install build-essential yasm nasm \ - xxd pkgconf curl wget unzip zip git subversion mercurial \ + xxd pkgconf curl wget unzip zip git subversion mercurial rsync \ autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \ texinfo texi2html help2man flex bison groff \ - gperf itstool ragel libc6-dev libssl-dev \ + gperf itstool ragel libc6-dev zlib1g-dev libssl-dev \ gtk-doc-tools gobject-introspection gawk \ ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \ python3-distutils python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \ diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index e655bcd..6cdc632 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -18,25 +18,26 @@ ffbuild_dockerbuild() { if [[ -n "$FFBUILD_RUST_TARGET" ]]; then unset PKG_CONFIG_LIBDIR - - export CC="gcc" - export CXX="g++" - export TARGET_CC="${FFBUILD_CROSS_PREFIX}gcc" - export TARGET_CXX="${FFBUILD_CROSS_PREFIX}g++" export CROSS_COMPILE=1 + + export TARGET_CC="$CC" + export TARGET_CXX="$CXX" export TARGET_CFLAGS="$CFLAGS" - export TARGET_CXXFLAGS="$CFLAGS" + export TARGET_CXXFLAGS="$CXXFLAGS" unset CFLAGS unset CXXFLAGS + export CC="gcc" + export CXX="g++" myconf+=( - --target="$FFBUILD_RUST_TARGET" + --target="${FFBUILD_RUST_TARGET}" + --config="target.${FFBUILD_RUST_TARGET}.linker=\"${TARGET_CC}\"" + --config="target.${FFBUILD_RUST_TARGET}.ar=\"${AR}\"" + # This is a horrible hack to work around cargo being too stupid for cross-builds to the same target. + # When building for Linux, it will try to build a build-time tool with the target-linker, which fails horribly. + # Since we are only creating a static lib, the linker is never actually used. So just always force it to host gcc. + --config="target.x86_64-unknown-linux-gnu.linker=\"gcc\"" ) - cat <$CARGO_HOME/config.toml -[target.$FFBUILD_RUST_TARGET] -linker = "${FFBUILD_CROSS_PREFIX}gcc" -ar = "${FFBUILD_CROSS_PREFIX}ar" -EOF fi cargo cinstall -v "${myconf[@]}"