diff --git a/archive-configs/ct-ng-armbox_hd51.config b/archive-configs/ct-ng-armbox_hd51.config index 4512199e..d423768d 100644 --- a/archive-configs/ct-ng-armbox_hd51.config +++ b/archive-configs/ct-ng-armbox_hd51.config @@ -11,6 +11,7 @@ CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y CT_CONFIGURE_has_autoconf_2_63_or_newer=y CT_CONFIGURE_has_autoreconf_2_63_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_cvs=y CT_CONFIGURE_has_svn=y @@ -75,7 +76,7 @@ CT_PATCH_ORDER="bundled" # # Build behavior # -CT_PARALLEL_JOBS=8 +CT_PARALLEL_JOBS=2 CT_LOAD="" CT_USE_PIPES=y CT_EXTRA_CFLAGS_FOR_BUILD="" @@ -223,49 +224,12 @@ CT_TOOLCHAIN_ENABLE_NLS=y # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="4.10.8" +CT_KERNEL_VERSION="${NI_CUSTOM_KERNEL_VERSION}" # CT_KERNEL_bare_metal is not set CT_KERNEL_linux=y -# CT_KERNEL_LINUX_CUSTOM is not set -CT_KERNEL_V_4_10=y -# CT_KERNEL_V_4_9 is not set -# CT_KERNEL_V_4_8 is not set -# CT_KERNEL_V_4_7 is not set -# CT_KERNEL_V_4_6 is not set -# CT_KERNEL_V_4_5 is not set -# CT_KERNEL_V_4_4 is not set -# CT_KERNEL_V_4_3 is not set -# CT_KERNEL_V_4_2 is not set -# CT_KERNEL_V_4_1 is not set -# CT_KERNEL_V_4_0 is not set -# CT_KERNEL_V_3_19 is not set -# CT_KERNEL_V_3_18 is not set -# CT_KERNEL_V_3_17 is not set -# CT_KERNEL_V_3_16 is not set -# CT_KERNEL_V_3_15 is not set -# CT_KERNEL_V_3_14 is not set -# CT_KERNEL_V_3_13 is not set -# CT_KERNEL_V_3_12 is not set -# CT_KERNEL_V_3_11 is not set -# CT_KERNEL_V_3_10 is not set -# CT_KERNEL_V_3_9 is not set -# CT_KERNEL_V_3_8 is not set -# CT_KERNEL_V_3_7 is not set -# CT_KERNEL_V_3_6 is not set -# CT_KERNEL_V_3_5 is not set -# CT_KERNEL_V_3_4 is not set -# CT_KERNEL_V_3_3 is not set -# CT_KERNEL_V_3_2 is not set -# CT_KERNEL_V_3_1 is not set -# CT_KERNEL_V_3_0 is not set -# CT_KERNEL_V_2_6_39 is not set -# CT_KERNEL_V_2_6_38 is not set -# CT_KERNEL_V_2_6_37 is not set -# CT_KERNEL_V_2_6_36 is not set -# CT_KERNEL_V_2_6_35 is not set -# CT_KERNEL_V_2_6_34 is not set -# CT_KERNEL_V_2_6_33 is not set -# CT_KERNEL_V_2_6_32 is not set +CT_KERNEL_LINUX_CUSTOM=y +CT_KERNEL_LINUX_CUSTOM_LOCATION="${NI_CUSTOM_KERNEL}" +CT_KERNEL_LINUX_CUSTOM_VERSION="${NI_CUSTOM_KERNEL_VERSION}" # # Common kernel options @@ -333,6 +297,7 @@ CT_BINUTILS_FOR_TARGET_BFD=y # CT_LIBC="glibc" CT_LIBC_VERSION="2.23" +# CT_LIBC_bionic is not set CT_LIBC_glibc=y # CT_LIBC_musl is not set # CT_LIBC_uClibc is not set @@ -384,7 +349,7 @@ CT_LIBC_ADDONS_LIST="" # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set -CT_LIBC_GLIBC_MIN_KERNEL="4.10.8" +CT_LIBC_GLIBC_MIN_KERNEL="${NI_CUSTOM_KERNEL_VERSION}" # # C compiler @@ -395,20 +360,23 @@ CT_CC_CORE_PASS_1_NEEDED=y CT_CC_CORE_PASS_2_NEEDED=y CT_CC_gcc=y # CT_CC_GCC_CUSTOM is not set -CT_CC_GCC_VERSION="linaro-4.9-2017.01" +CT_CC_GCC_VERSION="linaro-6.3-2017.02" CT_CC_GCC_SHOW_LINARO=y # CT_CC_GCC_V_7_1_0 is not set -# CT_CC_GCC_V_linaro_6_3 is not set +CT_CC_GCC_V_linaro_6_3=y # CT_CC_GCC_V_6_3_0 is not set # CT_CC_GCC_V_linaro_5_4 is not set # CT_CC_GCC_V_5_4_0 is not set -CT_CC_GCC_V_linaro_4_9=y +# CT_CC_GCC_V_linaro_4_9 is not set # CT_CC_GCC_V_4_9_4 is not set # CT_CC_GCC_V_linaro_4_8 is not set # CT_CC_GCC_V_4_8_5 is not set CT_CC_GCC_4_8_or_later=y -CT_CC_GCC_4_9=y CT_CC_GCC_4_9_or_later=y +CT_CC_GCC_5_or_later=y +CT_CC_GCC_6=y +CT_CC_GCC_6_or_later=y +CT_CC_GCC_HAS_LIBMPX=y CT_CC_GCC_ENABLE_CXX_FLAGS="" CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--with-float=hard" CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-float=hard" @@ -451,7 +419,6 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y # CT_CC_GCC_DEC_FLOATS_NO is not set CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y -CT_CC_SUPPORT_JAVA=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y @@ -462,7 +429,6 @@ CT_CC_SUPPORT_GOLANG=y # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set -# CT_CC_LANG_JAVA is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_OBJC is not set # CT_CC_LANG_OBJCXX is not set @@ -486,7 +452,6 @@ CT_GETTEXT_NEEDED=y CT_GMP_NEEDED=y CT_MPFR_NEEDED=y CT_ISL_NEEDED=y -CT_CLOOG_NEEDED=y CT_MPC_NEEDED=y CT_NCURSES_NEEDED=y CT_COMPLIBS=y @@ -495,7 +460,6 @@ CT_GETTEXT=y CT_GMP=y CT_MPFR=y CT_ISL=y -CT_CLOOG=y CT_MPC=y CT_NCURSES=y # CT_ZLIB is not set @@ -527,17 +491,16 @@ CT_MPFR_V_3_1_5=y # CT_MPFR_V_2_4_1 is not set # CT_MPFR_V_2_4_0 is not set CT_MPFR_VERSION="3.1.5" -CT_ISL_V_0_15=y +CT_ISL_V_0_18=y +# CT_ISL_V_0_17_1 is not set +# CT_ISL_V_0_16_1 is not set +# CT_ISL_V_0_15 is not set # CT_ISL_V_0_14 is not set -# CT_ISL_V_0_12_2 is not set +CT_ISL_V_0_16_or_later=y CT_ISL_V_0_15_or_later=y CT_ISL_V_0_14_or_later=y CT_ISL_V_0_12_or_later=y -CT_ISL_VERSION="0.15" -CT_CLOOG_V_0_18_4=y -CT_CLOOG_VERSION="0.18.4" -CT_CLOOG_0_18_4_or_later=y -CT_CLOOG_0_18_or_later=y +CT_ISL_VERSION="0.18" CT_MPC_V_1_0_3=y # CT_MPC_V_1_0_2 is not set # CT_MPC_V_1_0_1 is not set diff --git a/make/crosstool.mk b/make/crosstool.mk index f24a387b..7816f30d 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -95,11 +95,18 @@ crosstool-arm-hd51: CROSS_DIR-check git checkout 1dbb06f2 && \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ cd $(BUILD_TMP)/crosstool-ng && \ + mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \ + pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ + git checkout $(KERNEL_BRANCH) && \ + popd && \ + tar cf linux-$(KERNEL_VERSION).tar --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . && \ + mv linux-$(KERNEL_VERSION).tar $(BUILD_TMP)/crosstool-ng/targets/src/ && \ cp -a $(CONFIGS)/ct-ng-armbox_hd51.config .config && \ sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$(NUM_CPUS)@" .config && \ export NI_BASE_DIR=$(BASE_DIR) && \ - export CT_BASE_DIR=$(CROSS_BASE); \ - export LD_LIBRARY_PATH=; \ + export NI_CUSTOM_KERNEL=$(BUILD_TMP)/crosstool-ng/targets/src/linux-$(KERNEL_VERSION).tar && \ + export NI_CUSTOM_KERNEL_VERSION=$(KERNEL_VERSION) && \ + export LD_LIBRARY_PATH= && \ test -f ./configure || ./bootstrap && \ ./configure --enable-local; MAKELEVEL=0 make; chmod 0755 ct-ng && \ ./ct-ng oldconfig && \