From 516ca999a8f4fcb59f9b7c6f93c0072e7f357cc2 Mon Sep 17 00:00:00 2001 From: WXbet Date: Wed, 29 Jan 2020 22:04:00 +0100 Subject: [PATCH] more flexible toolchain.cfg creation (v0.8.3) update cross toolchain templates to newest crosstool-NG version fix version detection of installed libraries in toolchains config file updates (Please reset the config file) --- support/crosstool/templates/dream_aarch64 | 97 +++++++++-- support/crosstool/templates/dream_arm | 33 ++-- support/crosstool/templates/dream_mipsel | 53 ++++-- support/crosstool/templates/ds126play_armv7 | 175 ++----------------- support/crosstool/templates/rpi_armv6 | 102 ++++++++++-- support/crosstool/templates/rpi_armv7 | 100 +++++++++-- support/crosstool/templates/rpi_armv8 | 100 +++++++++-- support/crosstool/templates/vuplus4k_arm | 176 ++------------------ support/functions/_plugin_update_toolchain | 144 ++++++++-------- 9 files changed, 511 insertions(+), 469 deletions(-) diff --git a/support/crosstool/templates/dream_aarch64 b/support/crosstool/templates/dream_aarch64 index ff3fcb5..5fd0274 100644 --- a/support/crosstool/templates/dream_aarch64 +++ b/support/crosstool/templates/dream_aarch64 @@ -35,7 +35,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -162,7 +161,8 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -185,7 +185,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_12 is not set # CT_LINUX_V_3_10 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -218,9 +218,6 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -# CT_BINUTILS_V_2_32 is not set -# CT_BINUTILS_V_2_31 is not set -# CT_BINUTILS_V_2_30 is not set CT_BINUTILS_V_2_29=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set @@ -258,6 +255,7 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -332,7 +330,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="5.3.1" +CT_GLIBC_MIN_KERNEL="5.4.6" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set @@ -422,7 +420,22 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y CT_ALL_CC_CHOICES="GCC" CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set -# CT_DEBUG_DUMA is not set +CT_DEBUG_DUMA=y +CT_DEBUG_DUMA_PKG_KSYM="DUMA" +CT_DUMA_DIR_NAME="duma" +CT_DUMA_PKG_NAME="duma" +CT_DUMA_SRC_RELEASE=y +CT_DUMA_PATCH_ORDER="global" +CT_DUMA_V_2_5_15=y +# CT_DUMA_NO_VERSIONS is not set +CT_DUMA_VERSION="2_5_15" +CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}" +CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip" +CT_DUMA_SIGNATURE_FORMAT="" +CT_DUMA_SO=y +CT_DUMA_CUSTOM_WRAPPER=y CT_DEBUG_GDB=y CT_DEBUG_GDB_PKG_KSYM="GDB" CT_GDB_DIR_NAME="gdb" @@ -468,8 +481,50 @@ CT_GDB_HAS_PKGVERSION_BUGURL=y CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y -# CT_DEBUG_LTRACE is not set -# CT_DEBUG_STRACE is not set +CT_DEBUG_LTRACE=y +CT_DEBUG_LTRACE_PKG_KSYM="LTRACE" +CT_LTRACE_DIR_NAME="ltrace" +CT_LTRACE_PKG_NAME="ltrace" +CT_LTRACE_SRC_RELEASE=y +CT_LTRACE_PATCH_ORDER="global" +CT_LTRACE_V_0_7_3=y +# CT_LTRACE_NO_VERSIONS is not set +CT_LTRACE_VERSION="0.7.3" +CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace" +CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig" +CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2" +CT_LTRACE_SIGNATURE_FORMAT="" +CT_DEBUG_STRACE=y +CT_DEBUG_STRACE_PKG_KSYM="STRACE" +CT_STRACE_DIR_NAME="strace" +CT_STRACE_PKG_NAME="strace" +CT_STRACE_SRC_RELEASE=y +CT_STRACE_PATCH_ORDER="global" +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set +# CT_STRACE_V_5_2 is not set +# CT_STRACE_V_5_1 is not set +# CT_STRACE_V_5_0 is not set +# CT_STRACE_V_4_26 is not set +# CT_STRACE_V_4_25 is not set +# CT_STRACE_V_4_24 is not set +# CT_STRACE_V_4_23 is not set +# CT_STRACE_V_4_22 is not set +# CT_STRACE_V_4_21 is not set +# CT_STRACE_V_4_20 is not set +# CT_STRACE_V_4_19 is not set +# CT_STRACE_V_4_18 is not set +# CT_STRACE_V_4_17 is not set +# CT_STRACE_V_4_16 is not set +# CT_STRACE_V_4_15 is not set +# CT_STRACE_NO_VERSIONS is not set +CT_STRACE_VERSION="5.4" +CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" +CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_FORMATS=".tar.xz" +CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set @@ -481,7 +536,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -527,7 +582,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -535,7 +591,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -554,7 +610,20 @@ CT_ISL_0_13_or_later=y CT_ISL_later_than_0_12=y CT_ISL_0_12_or_later=y CT_ISL_REQUIRE_0_12_or_later=y -# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBELF=y +CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF" +CT_LIBELF_DIR_NAME="libelf" +CT_LIBELF_PKG_NAME="libelf" +CT_LIBELF_SRC_RELEASE=y +CT_LIBELF_PATCH_ORDER="global" +CT_LIBELF_V_0_8=y +# CT_LIBELF_NO_VERSIONS is not set +CT_LIBELF_VERSION="0.8.13" +CT_LIBELF_MIRRORS="http://www.mr511.de/software https://fossies.org/linux/misc/old" +CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_FORMATS=".tar.gz" +CT_LIBELF_SIGNATURE_FORMAT="" CT_COMP_LIBS_LIBICONV=y CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" CT_LIBICONV_DIR_NAME="libiconv" diff --git a/support/crosstool/templates/dream_arm b/support/crosstool/templates/dream_arm index 1d65b89..79e94fb 100644 --- a/support/crosstool/templates/dream_arm +++ b/support/crosstool/templates/dream_arm @@ -35,7 +35,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -178,7 +177,8 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -204,7 +204,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_2 is not set # CT_LINUX_V_2_6_32 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -235,7 +235,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -243,7 +244,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -274,6 +275,7 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -347,12 +349,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="5.3.1" -# 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 is not set +CT_GLIBC_MIN_KERNEL="5.4.6" CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -421,7 +418,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y # CT_CC_GCC_LIBSANITIZER is not set CT_CC_CXA_ATEXIT=y # CT_CC_GCC_DISABLE_PCH is not set -# CT_CC_GCC_SJLJ_EXCEPTIONS is not set +CT_CC_GCC_SJLJ_EXCEPTIONS=m CT_CC_GCC_LDBL_128=m # CT_CC_GCC_BUILD_ID is not set CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y @@ -516,7 +513,8 @@ CT_STRACE_DIR_NAME="strace" CT_STRACE_PKG_NAME="strace" CT_STRACE_SRC_RELEASE=y CT_STRACE_PATCH_ORDER="global" -CT_STRACE_V_5_3=y +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set # CT_STRACE_V_5_2 is not set # CT_STRACE_V_5_1 is not set # CT_STRACE_V_5_0 is not set @@ -533,7 +531,7 @@ CT_STRACE_V_5_3=y # CT_STRACE_V_4_16 is not set # CT_STRACE_V_4_15 is not set # CT_STRACE_NO_VERSIONS is not set -CT_STRACE_VERSION="5.3" +CT_STRACE_VERSION="5.4" CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -550,7 +548,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -596,7 +594,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -604,7 +603,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/support/crosstool/templates/dream_mipsel b/support/crosstool/templates/dream_mipsel index 707111a..f37411d 100644 --- a/support/crosstool/templates/dream_mipsel +++ b/support/crosstool/templates/dream_mipsel @@ -35,7 +35,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -163,7 +162,8 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -188,7 +188,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -220,7 +220,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -228,7 +229,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -253,6 +254,7 @@ CT_BINUTILS_LINKERS_LIST="ld" CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -327,7 +329,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="5.3.1" +CT_GLIBC_MIN_KERNEL="5.4.6" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set @@ -481,13 +483,27 @@ CT_GDB_HAS_PKGVERSION_BUGURL=y CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y -# CT_DEBUG_LTRACE is not set +CT_DEBUG_LTRACE=y +CT_DEBUG_LTRACE_PKG_KSYM="LTRACE" +CT_LTRACE_DIR_NAME="ltrace" +CT_LTRACE_PKG_NAME="ltrace" +CT_LTRACE_SRC_RELEASE=y +CT_LTRACE_PATCH_ORDER="global" +CT_LTRACE_V_0_7_3=y +# CT_LTRACE_NO_VERSIONS is not set +CT_LTRACE_VERSION="0.7.3" +CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace" +CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig" +CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2" +CT_LTRACE_SIGNATURE_FORMAT="" CT_DEBUG_STRACE=y CT_DEBUG_STRACE_PKG_KSYM="STRACE" CT_STRACE_DIR_NAME="strace" CT_STRACE_PKG_NAME="strace" CT_STRACE_SRC_RELEASE=y CT_STRACE_PATCH_ORDER="global" +# CT_STRACE_V_5_4 is not set CT_STRACE_V_5_3=y # CT_STRACE_V_5_2 is not set # CT_STRACE_V_5_1 is not set @@ -522,7 +538,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -568,7 +584,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -576,7 +593,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -595,7 +612,20 @@ CT_ISL_0_13_or_later=y CT_ISL_later_than_0_12=y CT_ISL_0_12_or_later=y CT_ISL_REQUIRE_0_12_or_later=y -# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBELF=y +CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF" +CT_LIBELF_DIR_NAME="libelf" +CT_LIBELF_PKG_NAME="libelf" +CT_LIBELF_SRC_RELEASE=y +CT_LIBELF_PATCH_ORDER="global" +CT_LIBELF_V_0_8=y +# CT_LIBELF_NO_VERSIONS is not set +CT_LIBELF_VERSION="0.8.13" +CT_LIBELF_MIRRORS="http://www.mr511.de/software https://fossies.org/linux/misc/old" +CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_FORMATS=".tar.gz" +CT_LIBELF_SIGNATURE_FORMAT="" CT_COMP_LIBS_LIBICONV=y CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" CT_LIBICONV_DIR_NAME="libiconv" @@ -690,6 +720,7 @@ CT_GMP_NEEDED=y CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y +CT_LIBELF_TARGET=y CT_EXPAT_NEEDED=y CT_EXPAT_TARGET=y CT_NCURSES_NEEDED=y diff --git a/support/crosstool/templates/ds126play_armv7 b/support/crosstool/templates/ds126play_armv7 index 65648d9..b19a9b2 100644 --- a/support/crosstool/templates/ds126play_armv7 +++ b/support/crosstool/templates/ds126play_armv7 @@ -1,8 +1,4 @@ #toolchain template: Synology DS216play (armv7-a+fp based, gcc 9.2.0, Glibc 2.23) -# -# Automatically generated file; DO NOT EDIT. -# crosstool-NG Configuration -# CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y @@ -28,21 +24,9 @@ CT_CONFIGURE_has_install_with_strip_program=y CT_CONFIG_VERSION_CURRENT="3" CT_CONFIG_VERSION="3" CT_MODULES=y - -# -# Paths and misc options -# - -# -# crosstool-NG behavior -# # CT_OBSOLETE is not set # CT_EXPERIMENTAL is not set # CT_DEBUG_CT is not set - -# -# Paths -# CT_LOCAL_TARBALLS_DIR="${HOME}/src" CT_SAVE_TARBALLS=y # CT_TARBALLS_BUILDROOT_LAYOUT is not set @@ -51,15 +35,10 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set - -# -# Downloading -# CT_DOWNLOAD_AGENT_WGET=y # CT_DOWNLOAD_AGENT_CURL is not set # CT_DOWNLOAD_AGENT_NONE is not set @@ -76,21 +55,13 @@ CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y # CT_VERIFY_DOWNLOAD_DIGEST_MD5 is not set CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512" # CT_VERIFY_DOWNLOAD_SIGNATURE is not set - -# -# Extracting -# # CT_FORCE_EXTRACT is not set CT_OVERRIDE_CONFIG_GUESS_SUB=y # CT_ONLY_EXTRACT is not set CT_PATCH_BUNDLED=y # CT_PATCH_BUNDLED_LOCAL is not set 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="" @@ -102,10 +73,6 @@ CT_EXTRA_LDFLAGS_FOR_HOST="" CT_CONFIG_SHELL_BASH=y # CT_CONFIG_SHELL_CUSTOM is not set CT_CONFIG_SHELL="${bash}" - -# -# Logging -# # CT_LOG_ERROR is not set # CT_LOG_WARN is not set # CT_LOG_INFO is not set @@ -117,10 +84,6 @@ CT_LOG_LEVEL_MAX="EXTRA" CT_LOG_PROGRESS_BAR=y CT_LOG_TO_FILE=y CT_LOG_FILE_COMPRESS=y - -# -# Target options -# # CT_ARCH_ALPHA is not set # CT_ARCH_ARC is not set CT_ARCH_ARM=y @@ -139,10 +102,6 @@ CT_ARCH_CHOICE_KSYM="ARM" CT_ARCH_CPU="" CT_ARCH_TUNE="" CT_ARCH_ARM_SHOW=y - -# -# Options for arm -# CT_ARCH_ARM_PKG_KSYM="" CT_ARCH_ARM_MODE="arm" CT_ARCH_ARM_MODE_ARM=y @@ -154,10 +113,6 @@ CT_ARCH_ARM_EABI=y CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set - -# -# Generic target options -# # CT_MULTILIB is not set CT_DEMULTILIB=y CT_ARCH_SUPPORTS_BOTH_MMU=y @@ -175,10 +130,6 @@ CT_ARCH_DEFAULT_32=y CT_ARCH_BITNESS=32 CT_ARCH_32=y # CT_ARCH_64 is not set - -# -# Target optimisations -# CT_ARCH_SUPPORTS_WITH_ARCH=y CT_ARCH_SUPPORTS_WITH_CPU=y CT_ARCH_SUPPORTS_WITH_TUNE=y @@ -195,14 +146,6 @@ CT_ARCH_FLOAT_HW=y CT_TARGET_CFLAGS="" CT_TARGET_LDFLAGS="" CT_ARCH_FLOAT="hard" - -# -# Toolchain options -# - -# -# General toolchain options -# CT_FORCE_SYSROOT=y CT_USE_SYSROOT=y CT_SYSROOT_NAME="sysroot" @@ -213,52 +156,29 @@ CT_WANTS_STATIC_LINK_CXX=y CT_SHOW_CT_VERSION=y CT_TOOLCHAIN_PKGVERSION="" CT_TOOLCHAIN_BUGURL="" - -# -# Tuple completion and aliasing -# CT_TARGET_VENDOR="ds216_play" CT_TARGET_ALIAS_SED_EXPR="" CT_TARGET_ALIAS="" - -# -# Toolchain type -# CT_CROSS=y # CT_CANADIAN is not set CT_TOOLCHAIN_TYPE="cross" - -# -# Build system -# CT_BUILD="" CT_BUILD_PREFIX="" CT_BUILD_SUFFIX="" - -# -# Misc options -# # CT_TOOLCHAIN_ENABLE_NLS is not set - -# -# Operating System -# CT_KERNEL_SUPPORTS_SHARED_LIBS=y # CT_KERNEL_BARE_METAL is not set CT_KERNEL_LINUX=y CT_KERNEL="linux" CT_KERNEL_CHOICE_KSYM="LINUX" CT_KERNEL_LINUX_SHOW=y - -# -# Options for linux -# CT_KERNEL_LINUX_PKG_KSYM="LINUX" CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -284,7 +204,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_2 is not set # CT_LINUX_V_2_6_32 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -302,24 +222,12 @@ CT_KERNEL_LINUX_VERBOSITY_0=y CT_KERNEL_LINUX_VERBOSE_LEVEL=0 CT_KERNEL_LINUX_INSTALL_CHECK=y CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS" - -# -# Common kernel options -# CT_SHARED_LIBS=y - -# -# Binary utilities -# CT_ARCH_BINFMT_ELF=y CT_BINUTILS_BINUTILS=y CT_BINUTILS="binutils" CT_BINUTILS_CHOICE_KSYM="BINUTILS" CT_BINUTILS_BINUTILS_SHOW=y - -# -# Options for binutils -# CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS" CT_BINUTILS_DIR_NAME="binutils" CT_BINUTILS_USE_GNU=y @@ -327,7 +235,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -335,7 +244,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -349,10 +258,6 @@ CT_BINUTILS_later_than_2_25=y CT_BINUTILS_2_25_or_later=y CT_BINUTILS_later_than_2_23=y CT_BINUTILS_2_23_or_later=y - -# -# GNU binutils -# CT_BINUTILS_HAS_HASH_STYLE=y CT_BINUTILS_HAS_GOLD=y CT_BINUTILS_HAS_PLUGINS=y @@ -370,23 +275,16 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" - -# -# C-library -# CT_LIBC_GLIBC=y # CT_LIBC_UCLIBC is not set CT_LIBC="glibc" CT_LIBC_CHOICE_KSYM="GLIBC" CT_THREADS="nptl" CT_LIBC_GLIBC_SHOW=y - -# -# Options for glibc -# CT_LIBC_GLIBC_PKG_KSYM="GLIBC" CT_GLIBC_DIR_NAME="glibc" CT_GLIBC_USE_GNU=y @@ -451,26 +349,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="5.3.1" -# 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 is not set +CT_GLIBC_MIN_KERNEL="5.4.6" CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y - -# -# Common C library options -# CT_THREADS_NATIVE=y # CT_CREATE_LDSO_CONF is not set CT_LIBC_XLDD=y - -# -# C compiler -# CT_CC_CORE_PASSES_NEEDED=y CT_CC_CORE_PASS_1_NEEDED=y CT_CC_CORE_PASS_2_NEEDED=y @@ -484,10 +369,6 @@ CT_CC_GCC=y CT_CC="gcc" CT_CC_CHOICE_KSYM="GCC" CT_CC_GCC_SHOW=y - -# -# Options for gcc -# CT_CC_GCC_PKG_KSYM="GCC" CT_GCC_DIR_NAME="gcc" CT_GCC_USE_GNU=y @@ -527,26 +408,14 @@ 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 - -# -# Optimisation features -# CT_CC_GCC_USE_GRAPHITE=y CT_CC_GCC_USE_LTO=y - -# -# Settings for libraries running on target -# CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y # CT_CC_GCC_LIBMUDFLAP is not set # CT_CC_GCC_LIBGOMP is not set # CT_CC_GCC_LIBSSP is not set # CT_CC_GCC_LIBQUADMATH is not set # CT_CC_GCC_LIBSANITIZER is not set - -# -# Misc. obscure options. -# CT_CC_CXA_ATEXIT=y # CT_CC_GCC_DISABLE_PCH is not set # CT_CC_GCC_SJLJ_EXCEPTIONS is not set @@ -562,16 +431,8 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y # CT_CC_GCC_DEC_FLOAT_DPD is not set # CT_CC_GCC_DEC_FLOATS_NO is not set CT_ALL_CC_CHOICES="GCC" - -# -# Additional supported languages: -# CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set - -# -# Debug facilities -# CT_DEBUG_DUMA=y CT_DEBUG_DUMA_PKG_KSYM="DUMA" CT_DUMA_DIR_NAME="duma" @@ -652,7 +513,8 @@ CT_STRACE_DIR_NAME="strace" CT_STRACE_PKG_NAME="strace" CT_STRACE_SRC_RELEASE=y CT_STRACE_PATCH_ORDER="global" -CT_STRACE_V_5_3=y +# CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set # CT_STRACE_V_5_2 is not set # CT_STRACE_V_5_1 is not set # CT_STRACE_V_5_0 is not set @@ -676,10 +538,6 @@ CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_STRACE_ARCHIVE_FORMATS=".tar.xz" CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" - -# -# Companion libraries -# # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set CT_COMP_LIBS_EXPAT=y @@ -690,7 +548,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -736,7 +594,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -744,7 +603,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -886,10 +745,6 @@ CT_MPC=y CT_EXPAT=y CT_NCURSES=y CT_ZLIB=y - -# -# Companion tools -# # CT_COMP_TOOLS_FOR_HOST is not set # CT_COMP_TOOLS_AUTOCONF is not set # CT_COMP_TOOLS_AUTOMAKE is not set diff --git a/support/crosstool/templates/rpi_armv6 b/support/crosstool/templates/rpi_armv6 index 64d95bc..c253ea8 100644 --- a/support/crosstool/templates/rpi_armv6 +++ b/support/crosstool/templates/rpi_armv6 @@ -35,7 +35,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -176,6 +175,7 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" +CT_LINUX_V_5_4=y # CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set @@ -196,19 +196,19 @@ CT_LINUX_PATCH_ORDER="global" # CT_LINUX_V_4_1 is not set # CT_LINUX_V_3_16 is not set # CT_LINUX_V_3_13 is not set -CT_LINUX_V_3_12=y +# CT_LINUX_V_3_12 is not set # 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_NO_VERSIONS is not set -CT_LINUX_VERSION="3.12.74" +CT_LINUX_VERSION="5.4.6" 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}" CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign" -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 @@ -233,7 +233,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -241,7 +242,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -273,6 +274,7 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -439,7 +441,22 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y CT_ALL_CC_CHOICES="GCC" CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set -# CT_DEBUG_DUMA is not set +CT_DEBUG_DUMA=y +CT_DEBUG_DUMA_PKG_KSYM="DUMA" +CT_DUMA_DIR_NAME="duma" +CT_DUMA_PKG_NAME="duma" +CT_DUMA_SRC_RELEASE=y +CT_DUMA_PATCH_ORDER="global" +CT_DUMA_V_2_5_15=y +# CT_DUMA_NO_VERSIONS is not set +CT_DUMA_VERSION="2_5_15" +CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}" +CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip" +CT_DUMA_SIGNATURE_FORMAT="" +CT_DUMA_SO=y +CT_DUMA_CUSTOM_WRAPPER=y CT_DEBUG_GDB=y CT_DEBUG_GDB_PKG_KSYM="GDB" CT_GDB_DIR_NAME="gdb" @@ -484,8 +501,50 @@ CT_GDB_HAS_PKGVERSION_BUGURL=y CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y -# CT_DEBUG_LTRACE is not set -# CT_DEBUG_STRACE is not set +CT_DEBUG_LTRACE=y +CT_DEBUG_LTRACE_PKG_KSYM="LTRACE" +CT_LTRACE_DIR_NAME="ltrace" +CT_LTRACE_PKG_NAME="ltrace" +CT_LTRACE_SRC_RELEASE=y +CT_LTRACE_PATCH_ORDER="global" +CT_LTRACE_V_0_7_3=y +# CT_LTRACE_NO_VERSIONS is not set +CT_LTRACE_VERSION="0.7.3" +CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace" +CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig" +CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2" +CT_LTRACE_SIGNATURE_FORMAT="" +CT_DEBUG_STRACE=y +CT_DEBUG_STRACE_PKG_KSYM="STRACE" +CT_STRACE_DIR_NAME="strace" +CT_STRACE_PKG_NAME="strace" +CT_STRACE_SRC_RELEASE=y +CT_STRACE_PATCH_ORDER="global" +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set +# CT_STRACE_V_5_2 is not set +# CT_STRACE_V_5_1 is not set +# CT_STRACE_V_5_0 is not set +# CT_STRACE_V_4_26 is not set +# CT_STRACE_V_4_25 is not set +# CT_STRACE_V_4_24 is not set +# CT_STRACE_V_4_23 is not set +# CT_STRACE_V_4_22 is not set +# CT_STRACE_V_4_21 is not set +# CT_STRACE_V_4_20 is not set +# CT_STRACE_V_4_19 is not set +# CT_STRACE_V_4_18 is not set +# CT_STRACE_V_4_17 is not set +# CT_STRACE_V_4_16 is not set +# CT_STRACE_V_4_15 is not set +# CT_STRACE_NO_VERSIONS is not set +CT_STRACE_VERSION="5.4" +CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" +CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_FORMATS=".tar.xz" +CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set @@ -497,7 +556,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -543,7 +602,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -551,7 +611,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -570,7 +630,20 @@ CT_ISL_0_13_or_later=y CT_ISL_later_than_0_12=y CT_ISL_0_12_or_later=y CT_ISL_REQUIRE_0_12_or_later=y -# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBELF=y +CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF" +CT_LIBELF_DIR_NAME="libelf" +CT_LIBELF_PKG_NAME="libelf" +CT_LIBELF_SRC_RELEASE=y +CT_LIBELF_PATCH_ORDER="global" +CT_LIBELF_V_0_8=y +# CT_LIBELF_NO_VERSIONS is not set +CT_LIBELF_VERSION="0.8.13" +CT_LIBELF_MIRRORS="http://www.mr511.de/software https://fossies.org/linux/misc/old" +CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_FORMATS=".tar.gz" +CT_LIBELF_SIGNATURE_FORMAT="" CT_COMP_LIBS_LIBICONV=y CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" CT_LIBICONV_DIR_NAME="libiconv" @@ -665,6 +738,7 @@ CT_GMP_NEEDED=y CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y +CT_LIBELF_TARGET=y CT_EXPAT_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y diff --git a/support/crosstool/templates/rpi_armv7 b/support/crosstool/templates/rpi_armv7 index ad1bf95..3077942 100644 --- a/support/crosstool/templates/rpi_armv7 +++ b/support/crosstool/templates/rpi_armv7 @@ -39,7 +39,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -180,7 +179,8 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -205,7 +205,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -237,7 +237,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -245,7 +246,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -277,6 +278,7 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -351,7 +353,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="5.3.1" +CT_GLIBC_MIN_KERNEL="5.4.6" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set @@ -442,7 +444,22 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y CT_ALL_CC_CHOICES="GCC" CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set -# CT_DEBUG_DUMA is not set +CT_DEBUG_DUMA=y +CT_DEBUG_DUMA_PKG_KSYM="DUMA" +CT_DUMA_DIR_NAME="duma" +CT_DUMA_PKG_NAME="duma" +CT_DUMA_SRC_RELEASE=y +CT_DUMA_PATCH_ORDER="global" +CT_DUMA_V_2_5_15=y +# CT_DUMA_NO_VERSIONS is not set +CT_DUMA_VERSION="2_5_15" +CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}" +CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip" +CT_DUMA_SIGNATURE_FORMAT="" +CT_DUMA_SO=y +CT_DUMA_CUSTOM_WRAPPER=y CT_DEBUG_GDB=y CT_DEBUG_GDB_PKG_KSYM="GDB" CT_GDB_DIR_NAME="gdb" @@ -488,8 +505,50 @@ CT_GDB_HAS_PKGVERSION_BUGURL=y CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y -# CT_DEBUG_LTRACE is not set -# CT_DEBUG_STRACE is not set +CT_DEBUG_LTRACE=y +CT_DEBUG_LTRACE_PKG_KSYM="LTRACE" +CT_LTRACE_DIR_NAME="ltrace" +CT_LTRACE_PKG_NAME="ltrace" +CT_LTRACE_SRC_RELEASE=y +CT_LTRACE_PATCH_ORDER="global" +CT_LTRACE_V_0_7_3=y +# CT_LTRACE_NO_VERSIONS is not set +CT_LTRACE_VERSION="0.7.3" +CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace" +CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig" +CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2" +CT_LTRACE_SIGNATURE_FORMAT="" +CT_DEBUG_STRACE=y +CT_DEBUG_STRACE_PKG_KSYM="STRACE" +CT_STRACE_DIR_NAME="strace" +CT_STRACE_PKG_NAME="strace" +CT_STRACE_SRC_RELEASE=y +CT_STRACE_PATCH_ORDER="global" +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set +# CT_STRACE_V_5_2 is not set +# CT_STRACE_V_5_1 is not set +# CT_STRACE_V_5_0 is not set +# CT_STRACE_V_4_26 is not set +# CT_STRACE_V_4_25 is not set +# CT_STRACE_V_4_24 is not set +# CT_STRACE_V_4_23 is not set +# CT_STRACE_V_4_22 is not set +# CT_STRACE_V_4_21 is not set +# CT_STRACE_V_4_20 is not set +# CT_STRACE_V_4_19 is not set +# CT_STRACE_V_4_18 is not set +# CT_STRACE_V_4_17 is not set +# CT_STRACE_V_4_16 is not set +# CT_STRACE_V_4_15 is not set +# CT_STRACE_NO_VERSIONS is not set +CT_STRACE_VERSION="5.4" +CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" +CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_FORMATS=".tar.xz" +CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set @@ -501,7 +560,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -547,7 +606,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -555,7 +615,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -574,7 +634,20 @@ CT_ISL_0_13_or_later=y CT_ISL_later_than_0_12=y CT_ISL_0_12_or_later=y CT_ISL_REQUIRE_0_12_or_later=y -# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBELF=y +CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF" +CT_LIBELF_DIR_NAME="libelf" +CT_LIBELF_PKG_NAME="libelf" +CT_LIBELF_SRC_RELEASE=y +CT_LIBELF_PATCH_ORDER="global" +CT_LIBELF_V_0_8=y +# CT_LIBELF_NO_VERSIONS is not set +CT_LIBELF_VERSION="0.8.13" +CT_LIBELF_MIRRORS="http://www.mr511.de/software https://fossies.org/linux/misc/old" +CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_FORMATS=".tar.gz" +CT_LIBELF_SIGNATURE_FORMAT="" CT_COMP_LIBS_LIBICONV=y CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" CT_LIBICONV_DIR_NAME="libiconv" @@ -669,6 +742,7 @@ CT_GMP_NEEDED=y CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y +CT_LIBELF_TARGET=y CT_EXPAT_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y diff --git a/support/crosstool/templates/rpi_armv8 b/support/crosstool/templates/rpi_armv8 index 7c1792d..8e3de0a 100644 --- a/support/crosstool/templates/rpi_armv8 +++ b/support/crosstool/templates/rpi_armv8 @@ -35,7 +35,6 @@ CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y @@ -176,7 +175,8 @@ CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -201,7 +201,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -233,7 +233,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -241,7 +242,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -273,6 +274,7 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" @@ -347,7 +349,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="5.3.1" +CT_GLIBC_MIN_KERNEL="5.4.6" CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_NO is not set # CT_GLIBC_SSP_YES is not set @@ -438,7 +440,22 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y CT_ALL_CC_CHOICES="GCC" CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set -# CT_DEBUG_DUMA is not set +CT_DEBUG_DUMA=y +CT_DEBUG_DUMA_PKG_KSYM="DUMA" +CT_DUMA_DIR_NAME="duma" +CT_DUMA_PKG_NAME="duma" +CT_DUMA_SRC_RELEASE=y +CT_DUMA_PATCH_ORDER="global" +CT_DUMA_V_2_5_15=y +# CT_DUMA_NO_VERSIONS is not set +CT_DUMA_VERSION="2_5_15" +CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}" +CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}" +CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip" +CT_DUMA_SIGNATURE_FORMAT="" +CT_DUMA_SO=y +CT_DUMA_CUSTOM_WRAPPER=y CT_DEBUG_GDB=y CT_DEBUG_GDB_PKG_KSYM="GDB" CT_GDB_DIR_NAME="gdb" @@ -484,8 +501,50 @@ CT_GDB_HAS_PKGVERSION_BUGURL=y CT_GDB_HAS_PYTHON=y CT_GDB_INSTALL_GDBINIT=y CT_GDB_HAS_IPA_LIB=y -# CT_DEBUG_LTRACE is not set -# CT_DEBUG_STRACE is not set +CT_DEBUG_LTRACE=y +CT_DEBUG_LTRACE_PKG_KSYM="LTRACE" +CT_LTRACE_DIR_NAME="ltrace" +CT_LTRACE_PKG_NAME="ltrace" +CT_LTRACE_SRC_RELEASE=y +CT_LTRACE_PATCH_ORDER="global" +CT_LTRACE_V_0_7_3=y +# CT_LTRACE_NO_VERSIONS is not set +CT_LTRACE_VERSION="0.7.3" +CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace" +CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig" +CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2" +CT_LTRACE_SIGNATURE_FORMAT="" +CT_DEBUG_STRACE=y +CT_DEBUG_STRACE_PKG_KSYM="STRACE" +CT_STRACE_DIR_NAME="strace" +CT_STRACE_PKG_NAME="strace" +CT_STRACE_SRC_RELEASE=y +CT_STRACE_PATCH_ORDER="global" +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set +# CT_STRACE_V_5_2 is not set +# CT_STRACE_V_5_1 is not set +# CT_STRACE_V_5_0 is not set +# CT_STRACE_V_4_26 is not set +# CT_STRACE_V_4_25 is not set +# CT_STRACE_V_4_24 is not set +# CT_STRACE_V_4_23 is not set +# CT_STRACE_V_4_22 is not set +# CT_STRACE_V_4_21 is not set +# CT_STRACE_V_4_20 is not set +# CT_STRACE_V_4_19 is not set +# CT_STRACE_V_4_18 is not set +# CT_STRACE_V_4_17 is not set +# CT_STRACE_V_4_16 is not set +# CT_STRACE_V_4_15 is not set +# CT_STRACE_NO_VERSIONS is not set +CT_STRACE_VERSION="5.4" +CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" +CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_STRACE_ARCHIVE_FORMATS=".tar.xz" +CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set @@ -497,7 +556,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -543,7 +602,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -551,7 +611,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -570,7 +630,20 @@ CT_ISL_0_13_or_later=y CT_ISL_later_than_0_12=y CT_ISL_0_12_or_later=y CT_ISL_REQUIRE_0_12_or_later=y -# CT_COMP_LIBS_LIBELF is not set +CT_COMP_LIBS_LIBELF=y +CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF" +CT_LIBELF_DIR_NAME="libelf" +CT_LIBELF_PKG_NAME="libelf" +CT_LIBELF_SRC_RELEASE=y +CT_LIBELF_PATCH_ORDER="global" +CT_LIBELF_V_0_8=y +# CT_LIBELF_NO_VERSIONS is not set +CT_LIBELF_VERSION="0.8.13" +CT_LIBELF_MIRRORS="http://www.mr511.de/software https://fossies.org/linux/misc/old" +CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_LIBELF_ARCHIVE_FORMATS=".tar.gz" +CT_LIBELF_SIGNATURE_FORMAT="" CT_COMP_LIBS_LIBICONV=y CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV" CT_LIBICONV_DIR_NAME="libiconv" @@ -665,6 +738,7 @@ CT_GMP_NEEDED=y CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y +CT_LIBELF_TARGET=y CT_EXPAT_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y diff --git a/support/crosstool/templates/vuplus4k_arm b/support/crosstool/templates/vuplus4k_arm index 20e9e19..e1d3b84 100644 --- a/support/crosstool/templates/vuplus4k_arm +++ b/support/crosstool/templates/vuplus4k_arm @@ -1,8 +1,4 @@ #toolchain template: Vu+ Zero|Uno|Duo|Solo|Ultimo 4K (arm based, gcc 9.2.0, Glibc 2.23) -# -# Automatically generated file; DO NOT EDIT. -# crosstool-NG Configuration -# CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y @@ -28,38 +24,21 @@ CT_CONFIGURE_has_install_with_strip_program=y CT_CONFIG_VERSION_CURRENT="3" CT_CONFIG_VERSION="3" CT_MODULES=y - -# -# Paths and misc options -# - -# -# crosstool-NG behavior -# # CT_OBSOLETE is not set # CT_EXPERIMENTAL is not set # CT_DEBUG_CT is not set - -# -# Paths -# -CT_LOCAL_TARBALLS_DIR="${HOME}/src" +CT_LOCAL_TARBALLS_DIR="/opt/s3/support/downloads" CT_SAVE_TARBALLS=y # CT_TARBALLS_BUILDROOT_LAYOUT is not set CT_WORK_DIR="${CT_TOP_DIR}/.build" CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" -CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" +CT_PREFIX_DIR="/opt/s3/support/toolchains/vuplus4k_arm" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y -# CT_BUILD_MANUALS is not set CT_INSTALL_LICENSES=y CT_PREFIX_DIR_RO=y CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set - -# -# Downloading -# CT_DOWNLOAD_AGENT_WGET=y # CT_DOWNLOAD_AGENT_CURL is not set # CT_DOWNLOAD_AGENT_NONE is not set @@ -76,21 +55,13 @@ CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y # CT_VERIFY_DOWNLOAD_DIGEST_MD5 is not set CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512" # CT_VERIFY_DOWNLOAD_SIGNATURE is not set - -# -# Extracting -# # CT_FORCE_EXTRACT is not set CT_OVERRIDE_CONFIG_GUESS_SUB=y # CT_ONLY_EXTRACT is not set CT_PATCH_BUNDLED=y # CT_PATCH_BUNDLED_LOCAL is not set 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="" @@ -102,10 +73,6 @@ CT_EXTRA_LDFLAGS_FOR_HOST="" CT_CONFIG_SHELL_BASH=y # CT_CONFIG_SHELL_CUSTOM is not set CT_CONFIG_SHELL="${bash}" - -# -# Logging -# # CT_LOG_ERROR is not set # CT_LOG_WARN is not set # CT_LOG_INFO is not set @@ -117,10 +84,6 @@ CT_LOG_LEVEL_MAX="EXTRA" CT_LOG_PROGRESS_BAR=y CT_LOG_TO_FILE=y CT_LOG_FILE_COMPRESS=y - -# -# Target options -# # CT_ARCH_ALPHA is not set # CT_ARCH_ARC is not set CT_ARCH_ARM=y @@ -139,10 +102,6 @@ CT_ARCH_CHOICE_KSYM="ARM" CT_ARCH_CPU="" CT_ARCH_TUNE="" CT_ARCH_ARM_SHOW=y - -# -# Options for arm -# CT_ARCH_ARM_PKG_KSYM="" CT_ARCH_ARM_MODE="arm" CT_ARCH_ARM_MODE_ARM=y @@ -154,10 +113,6 @@ CT_ARCH_ARM_TUPLE_USE_EABIHF=y CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set - -# -# Generic target options -# # CT_MULTILIB is not set CT_DEMULTILIB=y CT_ARCH_SUPPORTS_BOTH_MMU=y @@ -175,10 +130,6 @@ CT_ARCH_DEFAULT_32=y CT_ARCH_BITNESS=32 CT_ARCH_32=y # CT_ARCH_64 is not set - -# -# Target optimisations -# CT_ARCH_SUPPORTS_WITH_ARCH=y CT_ARCH_SUPPORTS_WITH_CPU=y CT_ARCH_SUPPORTS_WITH_TUNE=y @@ -195,14 +146,6 @@ CT_ARCH_FLOAT_HW=y CT_TARGET_CFLAGS="" CT_TARGET_LDFLAGS="" CT_ARCH_FLOAT="hard" - -# -# Toolchain options -# - -# -# General toolchain options -# CT_FORCE_SYSROOT=y CT_USE_SYSROOT=y CT_SYSROOT_NAME="sysroot" @@ -213,52 +156,29 @@ CT_WANTS_STATIC_LINK_CXX=y CT_SHOW_CT_VERSION=y CT_TOOLCHAIN_PKGVERSION="" CT_TOOLCHAIN_BUGURL="" - -# -# Tuple completion and aliasing -# CT_TARGET_VENDOR="vuplus4k" CT_TARGET_ALIAS_SED_EXPR="" CT_TARGET_ALIAS="" - -# -# Toolchain type -# CT_CROSS=y # CT_CANADIAN is not set CT_TOOLCHAIN_TYPE="cross" - -# -# Build system -# CT_BUILD="" CT_BUILD_PREFIX="" CT_BUILD_SUFFIX="" - -# -# Misc options -# # CT_TOOLCHAIN_ENABLE_NLS is not set - -# -# Operating System -# CT_KERNEL_SUPPORTS_SHARED_LIBS=y # CT_KERNEL_BARE_METAL is not set CT_KERNEL_LINUX=y CT_KERNEL="linux" CT_KERNEL_CHOICE_KSYM="LINUX" CT_KERNEL_LINUX_SHOW=y - -# -# Options for linux -# CT_KERNEL_LINUX_PKG_KSYM="LINUX" CT_LINUX_DIR_NAME="linux" CT_LINUX_PKG_NAME="linux" CT_LINUX_SRC_RELEASE=y CT_LINUX_PATCH_ORDER="global" -CT_LINUX_V_5_3=y +CT_LINUX_V_5_4=y +# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_0 is not set @@ -284,7 +204,7 @@ CT_LINUX_V_5_3=y # CT_LINUX_V_3_2 is not set # CT_LINUX_V_2_6_32 is not set # CT_LINUX_NO_VERSIONS is not set -CT_LINUX_VERSION="5.3.1" +CT_LINUX_VERSION="5.4.6" 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}" @@ -302,24 +222,12 @@ CT_KERNEL_LINUX_VERBOSITY_0=y CT_KERNEL_LINUX_VERBOSE_LEVEL=0 CT_KERNEL_LINUX_INSTALL_CHECK=y CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS" - -# -# Common kernel options -# CT_SHARED_LIBS=y - -# -# Binary utilities -# CT_ARCH_BINFMT_ELF=y CT_BINUTILS_BINUTILS=y CT_BINUTILS="binutils" CT_BINUTILS_CHOICE_KSYM="BINUTILS" CT_BINUTILS_BINUTILS_SHOW=y - -# -# Options for binutils -# CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS" CT_BINUTILS_DIR_NAME="binutils" CT_BINUTILS_USE_GNU=y @@ -327,7 +235,8 @@ CT_BINUTILS_USE="BINUTILS" CT_BINUTILS_PKG_NAME="binutils" CT_BINUTILS_SRC_RELEASE=y CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_32=y +CT_BINUTILS_V_2_33=y +# CT_BINUTILS_V_2_32 is not set # CT_BINUTILS_V_2_31 is not set # CT_BINUTILS_V_2_30 is not set # CT_BINUTILS_V_2_29 is not set @@ -335,7 +244,7 @@ CT_BINUTILS_V_2_32=y # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set # CT_BINUTILS_NO_VERSIONS is not set -CT_BINUTILS_VERSION="2.32" +CT_BINUTILS_VERSION="2.33.1" 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}" @@ -349,10 +258,6 @@ CT_BINUTILS_later_than_2_25=y CT_BINUTILS_2_25_or_later=y CT_BINUTILS_later_than_2_23=y CT_BINUTILS_2_23_or_later=y - -# -# GNU binutils -# CT_BINUTILS_HAS_HASH_STYLE=y CT_BINUTILS_HAS_GOLD=y CT_BINUTILS_HAS_PLUGINS=y @@ -370,23 +275,16 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_LINKER_DEFAULT="bfd" 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_ALL_BINUTILS_CHOICES="BINUTILS" - -# -# C-library -# CT_LIBC_GLIBC=y # CT_LIBC_UCLIBC is not set CT_LIBC="glibc" CT_LIBC_CHOICE_KSYM="GLIBC" CT_THREADS="nptl" CT_LIBC_GLIBC_SHOW=y - -# -# Options for glibc -# CT_LIBC_GLIBC_PKG_KSYM="GLIBC" CT_GLIBC_DIR_NAME="glibc" CT_GLIBC_USE_GNU=y @@ -451,21 +349,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="5.3.1" +CT_GLIBC_MIN_KERNEL="5.4.6" CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y - -# -# Common C library options -# CT_THREADS_NATIVE=y # CT_CREATE_LDSO_CONF is not set CT_LIBC_XLDD=y - -# -# C compiler -# CT_CC_CORE_PASSES_NEEDED=y CT_CC_CORE_PASS_1_NEEDED=y CT_CC_CORE_PASS_2_NEEDED=y @@ -479,10 +369,6 @@ CT_CC_GCC=y CT_CC="gcc" CT_CC_CHOICE_KSYM="GCC" CT_CC_GCC_SHOW=y - -# -# Options for gcc -# CT_CC_GCC_PKG_KSYM="GCC" CT_GCC_DIR_NAME="gcc" CT_GCC_USE_GNU=y @@ -522,26 +408,14 @@ 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 - -# -# Optimisation features -# CT_CC_GCC_USE_GRAPHITE=y CT_CC_GCC_USE_LTO=y - -# -# Settings for libraries running on target -# CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y # CT_CC_GCC_LIBMUDFLAP is not set # CT_CC_GCC_LIBGOMP is not set # CT_CC_GCC_LIBSSP is not set # CT_CC_GCC_LIBQUADMATH is not set # CT_CC_GCC_LIBSANITIZER is not set - -# -# Misc. obscure options. -# CT_CC_CXA_ATEXIT=y # CT_CC_GCC_DISABLE_PCH is not set # CT_CC_GCC_SJLJ_EXCEPTIONS is not set @@ -557,16 +431,8 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y # CT_CC_GCC_DEC_FLOAT_DPD is not set # CT_CC_GCC_DEC_FLOATS_NO is not set CT_ALL_CC_CHOICES="GCC" - -# -# Additional supported languages: -# CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set - -# -# Debug facilities -# CT_DEBUG_DUMA=y CT_DEBUG_DUMA_PKG_KSYM="DUMA" CT_DUMA_DIR_NAME="duma" @@ -647,7 +513,8 @@ CT_STRACE_DIR_NAME="strace" CT_STRACE_PKG_NAME="strace" CT_STRACE_SRC_RELEASE=y CT_STRACE_PATCH_ORDER="global" -CT_STRACE_V_5_3=y +CT_STRACE_V_5_4=y +# CT_STRACE_V_5_3 is not set # CT_STRACE_V_5_2 is not set # CT_STRACE_V_5_1 is not set # CT_STRACE_V_5_0 is not set @@ -664,17 +531,13 @@ CT_STRACE_V_5_3=y # CT_STRACE_V_4_16 is not set # CT_STRACE_V_4_15 is not set # CT_STRACE_NO_VERSIONS is not set -CT_STRACE_VERSION="5.3" +CT_STRACE_VERSION="5.4" CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}" CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_STRACE_ARCHIVE_FORMATS=".tar.xz" CT_STRACE_SIGNATURE_FORMAT="" CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE" - -# -# Companion libraries -# # CT_COMPLIBS_CHECK is not set # CT_COMP_LIBS_CLOOG is not set CT_COMP_LIBS_EXPAT=y @@ -685,7 +548,7 @@ CT_EXPAT_SRC_RELEASE=y CT_EXPAT_PATCH_ORDER="global" CT_EXPAT_V_2_2=y # CT_EXPAT_NO_VERSIONS is not set -CT_EXPAT_VERSION="2.2.8" +CT_EXPAT_VERSION="2.2.9" CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}" CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -731,7 +594,8 @@ CT_ISL_DIR_NAME="isl" CT_ISL_PKG_NAME="isl" CT_ISL_SRC_RELEASE=y CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_21=y +CT_ISL_V_0_22=y +# CT_ISL_V_0_21 is not set # CT_ISL_V_0_20 is not set # CT_ISL_V_0_19 is not set # CT_ISL_V_0_18 is not set @@ -739,7 +603,7 @@ CT_ISL_V_0_21=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set -CT_ISL_VERSION="0.21" +CT_ISL_VERSION="0.22" CT_ISL_MIRRORS="http://isl.gforge.inria.fr" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -881,10 +745,6 @@ CT_MPC=y CT_EXPAT=y CT_NCURSES=y CT_ZLIB=y - -# -# Companion tools -# # CT_COMP_TOOLS_FOR_HOST is not set # CT_COMP_TOOLS_AUTOCONF is not set # CT_COMP_TOOLS_AUTOMAKE is not set diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 6a2810c..3d36bd8 100644 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -1,11 +1,11 @@ #!/bin/bash -#simplebuild_plugin tcupdate (s3.TUP) 0.8.2 +#simplebuild_plugin tcupdate (s3.TUP) 0.8.3 tcupdate(){ clear && _check_bin; - pversion="0.8.2"; + pversion="0.8.3"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -108,7 +108,7 @@ tcupdate(){ ranlibname="$_compiler""ranlib";ranlibname=$(realpath -s $ranlibname); hostname=${_compiler%?}; sr=$("$compilername" -print-sysroot 2>/dev/null); - sr=$(realpath -sm "$sr"); + sr=$(realpath -sm "$sr" 2>/dev/null); if [ ${#sr} -gt ${#tcdir} ];then [ -d "$sr/include" ] && cd "$sr" [ -d "$sr/usr/include" ] && cd "$sr/usr" @@ -128,16 +128,17 @@ tcupdate(){ libdesc="$i"_desc;libdesc=${!libdesc}; libversion="$i"_version;libversion=${!libversion}; libcheck="$i"_check;libcheck=${!libcheck}; + libversioncheck=$(echo "$libcheck" | awk '{printf $2}') + libcheck=$(echo "$libcheck" | awk '{printf $1}') liburl="$i"_url;liburl=${!liburl}; - libversioncheck=$(echo $libversion | sed -e 's/[a-zA-Z]//g'); libversioncurrent=$(_get_version "$pkgdir/$libcheck" "$libversioncheck"); - libversioncompare=$(_compare_version $libversion $(echo $libversioncurrent | sed -e 's/^$/0.0.0/g') | sed -e 's/>//g'); + libversioncompare=$(_compare_version $libversion $(echo $libversioncurrent | sed -e 's/^$/0.0.0/g')); libtasks="$i"_tasks[@];libtasks=("${!libtasks}"); libexports="$i"_exports[@];libexports=("${!libexports}"); libconfigure="$i"_configure[@];libconfigure=("${!libconfigure}"); libmake="$i"_make[@];libmake=("${!libmake}"); - MENU_OPTIONS+=("$i" "$libname $libversion $libversioncompare $(echo $libversioncurrent | sed -e 's/^$/ ---/g')" "$([ $libversioncurrent ] && echo "on" || echo "off")" "$([ $libname ] && echo "$libname $libversion: $liburl")");counter; + MENU_OPTIONS+=("$i" "$libname $libversion $([ $libversioncurrent ] && echo $libversioncompare) $(echo $libversioncurrent | sed -e 's/^$/ ---/g')" "$([ $libversioncurrent ] && echo "on" || echo "off")" "$([ $libname ] && echo "$libname $libversion: $liburl")");counter; # 0 key 1 desc 2 version 3 checkversion 4 checkfile 5 current version 6 url 7 tasks array lib=("$libkey" "$libname" "$libversion" "$libversioncheck" "$libcheck" "$libversioncurrent" "$liburl" "(${libtasks[*]@Q})"); @@ -238,7 +239,7 @@ _create_tc(){ for tpl in $opts;do if [ -f "$cttpldir/$tpl" ]; then - logfile="$ldir/$(date +%F)_$(date +%T)_update_toolchain_crosstoolchain_"$tpl".log" && ((i++)); + logfile="$ldir/$(date +%F)_$(date +%T)_update_toolchain_crosstoolchain_"$tpl".log"; ((i++)); clear; sp=$(printf '%*s' 80 | tr ' ' '=') @@ -253,9 +254,6 @@ _create_tc(){ #CT_PREFIX_DIR aka folder that contains the final toolchain echo "sed -i \"s#.*CT_PREFIX_DIR=.*#CT_PREFIX_DIR=\"$tcdir/$tpl\"#g\" "$ctsrcdir/.config";" | tee -a "$logfile"; sed -i "s#.*CT_PREFIX_DIR=.*#CT_PREFIX_DIR=\"$tcdir/$tpl\"#g" "$ctsrcdir/.config"; - #CT_PARALLEL_JOBS aka parallel build job count - echo "sed -i \"s#.*CT_PARALLEL_JOBS=.*#CT_PARALLEL_JOBS=$CTNG_PARALLEL_JOBS#g\" "$ctsrcdir/.config";" | tee -a "$logfile"; - sed -i "s#.*CT_PARALLEL_JOBS=.*#CT_PARALLEL_JOBS=$CTNG_PARALLEL_JOBS#g" "$ctsrcdir/.config"; #run build as $CTNG_USER bcl=$(printf '%s\n' "${CTNG_BUILD_tasks[@]}"); @@ -278,7 +276,7 @@ _create_tc(){ #create toolchain.cfg desc=$(sed -n -e '/#toolchain template/ s/.*\: *//p' "$cttpldir/$tpl"); - _create_toolchaincfg "$tcdir/$tpl" "$tpl" "$target" "$desc" "$dldir/Toolchain-$tpl.tar.xz"; + _create_toolchaincfg "$tcdir/$tpl" "$tpl" "$target" "" "" "$desc" "" "$dldir/Toolchain-$tpl.tar.xz"; else _paktc_timer 10; fi; @@ -340,8 +338,8 @@ _copy(){ _compress "$xzfile" "$tcdir/$1" #create toolchain.cfg - source "$tccfgdir/$1" && target="${_compiler%?}" && desc="$_description"; - _create_toolchaincfg "$tcdir/$1" "$newtc" "$target" "$desc" "$xzfile"; + source "$tccfgdir/$1" && target="${_compiler%?}" && sysroot="$_sysroot" && lsd="$_libsearchdir" && desc="$_description" && info="$_tc_info"; + _create_toolchaincfg "$tcdir/$1" "$newtc" "$target" "$sysroot" "$lsd" "$desc" "$info" "$xzfile"; ) | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Copy $1 to $newtc ... ]- " "$pb_" "$_lines" "$_cols"; [ -f "$newtccfgfile" ] && echo "$newtc"; }; @@ -358,7 +356,7 @@ _build(){ bcl=$(printf '%s\n' "${tasks[@]}"); sp=$(printf '%*s' 80 | tr ' ' '=') - echo -e "$sp\nbuild command list for $desc:\n$sp\ncd "$libsrcdir"\n$bcl\n$sp" | tee -a "$lf"; + echo -e "$sp\nbuild command list for $desc:\n$sp\ncd "$libsrcdir\;"\n$bcl\n$sp" | tee -a "$lf"; sleep 2; cd "$libsrcdir"; ( eval "${tasks[@]}" ) 2>&1 | tee -a "$lf" @@ -460,18 +458,23 @@ _get_version(){ if [ -f "$1" ];then content=$(cat "$1"); ver=$(echo "$content" | grep 'Version:' | sed -e "s/Version: //g"); - (echo "$ver" | grep -qc "$2") && r="$ver"; + if [ "$2" == "" ]; then + r="$ver"; + else + (echo "$ver" | grep -qc "$2") && r="$ver"; + fi; fi; echo $r; [ ${#r} -gt 0 ] && exit 0 || exit 1; }; _compare_version(){ + min=$(printf "$1\n$2\n" | sort -V | head -n1); max=$(printf "$1\n$2\n" | sort -V | tail -n1); - [ $min == $max ] && printf '=' && exit; - [ $1 == $max ] && printf '>' && exit; - [ $1 == $min ] && printf '<' && exit; + [ $min == $max ] && printf '=' && return; + [ $1 == $max ] && printf '>' && return; + [ $1 == $min ] && printf '<' && return; }; _paktc_timer(){ if [ "$1" == "0" ] || [ "${#1}" -eq 0 ];then @@ -544,47 +547,43 @@ _create_config(){ return 1; fi; - lib_comments=( "#Enable/Disable (1|0)" \ - "#Displayname" \ - "#Versionnumber" \ - "#Filename to check in pkgconfig folder for an existing library to get version information" \ - "#Valid URL for downloading sources of library\n#List of build commands below. Pay attention to the SEMICOLON at the end of EACH\n#command and the correct quoting (' or \") for or to avoid expansion of variables.\n#Tokens @TOOLCHAIN@, @CC@, @RANLIB@, @PREFIX@, @HOST@ are replaced automatically." \ - "#build command" - ); + lib_comments=( "#Enable/Disable (1|0)" + "#Displayname" + "#Versionnumber" + "#Filename and optional version number to check in pkgconfig folder for an existing library to get version information" + "#Valid URL for downloading sources of library\n#List of build commands below. Pay attention to the SEMICOLON at the end of EACH\n#command and the correct quoting (' or \") for or to avoid expansion of variables.\n#Tokens @TOOLCHAIN@, @CC@, @RANLIB@, @PREFIX@, @HOST@ are replaced automatically." + "#build command" ); lib_settings=( "" name version check url tasks ); lib_keys=( SAMPLE_LIB SSL_111 SSL_110 SSL_102 SSL_100 SSL_098 LIB_USB LIB_PCSC LIB_ZLIB ); lib_names=( "SampleLib" "OpenSSL" "OpenSSL" "OpenSSL" "OpenSSL" "OpenSSL" "libusb" "PCSC-Lite" "zlib" ); - lib_versions=( "0.2.9sl" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_1[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_0[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_2[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_0[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_0_9_8[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g')" \ - "$(curl --silent "https://api.github.com/repos/libusb/libusb/releases/latest" | jq -r '.tag_name' | cut -c 2-)" \ - "$(curl --silent https://salsa.debian.org/api/v4/projects/19181/repository/tags | jq -r '.[0].name' | awk -F '[/-]' '{printf $2}')" \ - "$(curl --silent https://api.github.com/repos/madler/zlib/tags | jq -r '.[0].name' | cut -c 2-)" \ - ); + lib_versions=( "0.2.9sl" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_1[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g; s#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_0[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g; s#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_2[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g; s#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_0[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g; s#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_0_9_8[a-z].*"))][0] | .name' | sed -e 's#OpenSSL_##g; s#_#.#g; s#\"##g')" + "$(curl --silent "https://api.github.com/repos/libusb/libusb/releases/latest" | jq -r '.tag_name' | cut -c 2-)" + "$(curl --silent https://salsa.debian.org/api/v4/projects/19181/repository/tags | jq -r '.[0].name' | awk -F '[/-]' '{printf $2}')" + "$(curl --silent https://api.github.com/repos/madler/zlib/tags | jq -r '.[0].name' | cut -c 2-)" ); lib_checks=( "samplelib.pc" "openssl.pc" "openssl.pc" "openssl.pc" "openssl.pc" "openssl.pc" "libusb-1.0.pc" "libpcsclite.pc" "zlib.pc" ); - lib_urls=( "https://sampleurl.com/archive.tar.bz" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_1[a-z].*"))][0] | .tarball_url')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_0[a-z].*"))][0] | .tarball_url')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_2[a-z].*"))][0] | .tarball_url')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_0[a-z].*"))][0] | .tarball_url')" \ - "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_0_9_8[a-z].*"))][0] | .tarball_url')" \ - "$(curl --silent "https://api.github.com/repos/libusb/libusb/releases/latest" | jq -r '.assets[1].browser_download_url')" \ - "$(echo 'https://salsa.debian.org/api/v4/projects/19181/repository/archive.tar.bz2?sha='$(curl --silent https://salsa.debian.org/api/v4/projects/19181/repository/tags | jq -r '.[0].commit.id'))" \ - "$(curl --silent https://api.github.com/repos/madler/zlib/tags | jq -r '.[0].tarball_url')" \ - ); - lib_tasks=( '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ --host=@HOST@ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install SHLIB_VERSION_NUMBER=1.0.2 SHLIB_MINOR=0.2;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/ --host=@HOST@ --disable-udev;\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/ --host=@HOST@ --disable-libudev --disable-libsystemd LIBUSB_LIBS=\\\"-L@PREFIX@/lib -lusb-1.0 -lrt\\\" LIBUSB_CFLAGS=\\\"-I@PREFIX@/include/libusb-1.0\\\";\")" "(\"make;\")" "(\"make install;\")" )' \ - '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/;\")" "(\"make;\")" "(\"make install;\")" )' \ - ); + lib_urls=( "https://sampleurl.com/archive.tar.bz" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_1[a-z].*"))][0] | .tarball_url' | sed -e 's#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_1_0[a-z].*"))][0] | .tarball_url' | sed -e 's#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=1&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_2[a-z].*"))][0] | .tarball_url' | sed -e 's#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_1_0_0[a-z].*"))][0] | .tarball_url' | sed -e 's#\"##g')" + "$(curl --silent "https://api.github.com/repos/openssl/openssl/tags?page=2&per_page=100" | jq '[.[] | select(.name|test("OpenSSL_0_9_8[a-z].*"))][0] | .tarball_url' | sed -e 's#\"##g')" + "$(curl --silent "https://api.github.com/repos/libusb/libusb/releases/latest" | jq -r '.assets[1].browser_download_url')" + "$(echo 'https://salsa.debian.org/api/v4/projects/19181/repository/archive.tar.bz2?sha='$(curl --silent https://salsa.debian.org/api/v4/projects/19181/repository/tags | jq -r '.[0].commit.id'))" + "$(curl --silent https://api.github.com/repos/madler/zlib/tags | jq -r '.[0].tarball_url')" ); + lib_tasks=( '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ --host=@HOST@ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install SHLIB_VERSION_NUMBER=1.0.2 SHLIB_MINOR=0.2;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "(\"export RANLIB=@RANLIB@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./Configure --prefix=@PREFIX@/ linux-generic32 shared;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/ --host=@HOST@ --disable-udev;\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/ --host=@HOST@ --disable-libudev --disable-libsystemd LIBUSB_LIBS=\\\"-L@PREFIX@/lib -lusb-1.0 -lrt\\\" LIBUSB_CFLAGS=\\\"-I@PREFIX@/include/libusb-1.0\\\";\")" "(\"make;\")" "(\"make install;\")" )' + '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/;\")" "(\"make;\")" "(\"make install;\")" )' ); ctng_build_tasks=( "(\"./ct-ng build;\")" ); ctng_build_tasks_comment="#build command"; @@ -594,7 +593,6 @@ _create_config(){ echo '#CROSS toolchain build settings' >"$configname"; echo 'CTNG_USER="ctng"; #low privileged user that run ct-ng (will be created automatically, if not exists)' >>"$configname"; echo 'CTNG_REPO_URL="https://github.com/crosstool-ng/crosstool-ng"; #Repository to load ct-ng from' >>"$configname"; - echo 'CTNG_PARALLEL_JOBS="4"; #Number of parallel build jobs' >>"$configname"; echo '#List of build and setup commands below. Pay attention to the SEMICOLON at the end of EACH' >>"$configname"; echo '#command and the correct quoting ('"'"' or ") for or to avoid expansion of variables.' >>"$configname"; echo '#Tokens @CTNGSOURCE@ are replaced automatically. The commands are executed in the context of the user CTNG_USER.' >>"$configname"; @@ -626,7 +624,8 @@ _create_config(){ echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"$([ "$key" == "SAMPLE_LIB" ] && echo '0' || echo '1')\";$([ "$i" -eq "0" ] && echo " ${lib_comments[0]}")" >>"$configname";; "name") echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"${lib_names[$i]}\";$([ "$i" -eq "0" ] && echo " ${lib_comments[1]}")" >>"$configname";; "version") echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"${lib_versions[$i]}\";$([ "$i" -eq "0" ] && echo " ${lib_comments[2]}")" >>"$configname";; - "check") echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"${lib_checks[$i]}\";$([ "$i" -eq "0" ] && echo " ${lib_comments[3]}")" >>"$configname";; + "check") [ $(echo -e "$key" | grep -c "SSL_\|SAMPLE_") -gt 0 ] && chk="$(echo -e "${lib_checks[$i]} $(echo ${lib_versions[$i]} | sed -e 's/[a-zA-Z]//g')")" || chk="${lib_checks[$i]}"; + echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"$chk\";$([ "$i" -eq "0" ] && echo " ${lib_comments[3]}")" >>"$configname";; "url") echo -e "$key"$([ ! -z $setting ] && echo "_")"$setting""=\"${lib_urls[$i]}\";$([ "$i" -eq "0" ] && echo " ${lib_comments[4]}")" >>"$configname";; "tasks") unset tasks;j=0; declare -a tasks="${lib_tasks[$i]}" @@ -639,33 +638,40 @@ _create_config(){ done; ((i++)) done; - + return 0; }; _create_toolchaincfg(){ cd "$1/bin"; compilername="$3""-gcc";compilername=$(realpath -s $compilername); sr=$("$compilername" -print-sysroot 2>/dev/null); - sr=$(realpath -sm "$sr"); - sysroot=${sr#"$1/"}; + sr=$(realpath -sm "$sr" 2>/dev/null); + if [ ${#sr} -eq 0 ];then + sysroot="$4"; + else + sysroot="${sr#"$1/"}"; + fi; + [ ${#5} -gt 0 ] && lsd="$5" || lsd="/usr/lib"; + [ ${#7} -gt 0 ] && info="$7" || info="$(echo -e "\\\n +!!! crosstool-NG Toolchain !!!\\\n +\\\n +$6\\\n +\\\n")"; + cd "$tccfgdir"; cat << EOF > $2 _toolchainname="$2"; default_use="USE_UTF8 USE_LIBCRYPTO"; -_description="$4" +_description="$6" _oscamconfdir_default="/etc/tuxbox/config"; _oscamconfdir_custom=""; _compiler="$3-"; _sysroot="$sysroot"; -_libsearchdir="/usr/lib"; -_toolchainfilename="$(echo -en "$(basename "${5%..*}")" | base64)"; -_md5sum="$(cd "$dldir" && md5sum $(basename "${5%..*}"))"; -_tc_info="$(echo -e "\\\n -!!! crosstool-NG Toolchain !!!\\\n -\\\n -$4\\\n -\\\n")"; +_libsearchdir="$lsd"; +_toolchainfilename="$(echo -en "$(basename "${8%..*}")" | base64)"; +_md5sum="$(cd "$dldir" && md5sum $(basename "${8%..*}"))"; +_tc_info="$info"; _tc_infolines="5"; EOF };