From 890acc2390db38eff897f75a041b682cf183242f Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Mon, 15 Jun 2020 14:21:19 +0200
Subject: [PATCH] hd2: bump version uClibc-ng-1.0.34; gcc-9.2.0

---
 ...=> ct-ng-git-5659366-gcc-9.2.0-hd2.config} | 29 +++++++++++++------
 ...0.32.config => ct-ng-uClibc-1.0.34.config} |  4 +--
 make/crosstool.mk                             |  2 +-
 make/versions.mk                              |  6 ++--
 4 files changed, 26 insertions(+), 15 deletions(-)
 rename archive-patches/ct-ng/{ct-ng-git-7bd6bb0-gcc-8.3.0-hd2.config => ct-ng-git-5659366-gcc-9.2.0-hd2.config} (97%)
 rename archive-patches/ct-ng/{ct-ng-uClibc-1.0.32.config => ct-ng-uClibc-1.0.34.config} (98%)

diff --git a/archive-patches/ct-ng/ct-ng-git-7bd6bb0-gcc-8.3.0-hd2.config b/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config
similarity index 97%
rename from archive-patches/ct-ng/ct-ng-git-7bd6bb0-gcc-8.3.0-hd2.config
rename to archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config
index 1861f6e..4d9af0a 100644
--- a/archive-patches/ct-ng/ct-ng-git-7bd6bb0-gcc-8.3.0-hd2.config
+++ b/archive-patches/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config
@@ -48,6 +48,7 @@ CT_SAVE_TARBALLS=y
 # CT_TARBALLS_BUILDROOT_LAYOUT is not set
 CT_WORK_DIR="${CT_TOP_DIR}/targets"
 CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
+CT_BUILD_DIR="${CT_BUILD_TOP_DIR}/build"
 CT_PREFIX_DIR="${CST_BASE_DIR}/cross"
 CT_RM_RF_PREFIX_DIR=y
 CT_REMOVE_DOCS=y
@@ -276,6 +277,7 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
 CT_LINUX_VERY_NEW=y
+# CT_LINUX_V_5_5 is not set
 # CT_LINUX_V_5_4 is not set
 # CT_LINUX_V_5_3 is not set
 # CT_LINUX_V_5_2 is not set
@@ -384,7 +386,8 @@ 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_33=y
+CT_BINUTILS_V_2_34=y
+# CT_BINUTILS_V_2_33 is not set
 # CT_BINUTILS_V_2_32 is not set
 # CT_BINUTILS_V_2_31 is not set
 # CT_BINUTILS_V_2_30 is not set
@@ -396,7 +399,7 @@ CT_BINUTILS_V_2_33=y
 # CT_BINUTILS_V_2_24 is not set
 # CT_BINUTILS_V_2_23 is not set
 # CT_BINUTILS_NO_VERSIONS is not set
-CT_BINUTILS_VERSION="2.33.1"
+CT_BINUTILS_VERSION="2.34"
 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}"
@@ -456,9 +459,10 @@ CT_UCLIBC_USE_UCLIBC_NG_ORG=y
 # CT_UCLIBC_USE_UCLIBC_ORG is not set
 CT_UCLIBC_USE="UCLIBC_NG"
 CT_UCLIBC_NG_PKG_NAME="uClibc-ng"
-CT_UCLIBC_NG_SRC_RELEASE=y
+# CT_UCLIBC_NG_SRC_RELEASE is not set
 # CT_UCLIBC_NG_SRC_DEVEL is not set
-# CT_UCLIBC_NG_SRC_CUSTOM is not set
+CT_UCLIBC_NG_SRC_CUSTOM=y
+CT_UCLIBC_NG_CUSTOM_LOCATION="${CST_BASE_DIR}/build_tmp/uClibc-ng-1.0.34"
 CT_UCLIBC_NG_PATCH_GLOBAL=y
 # CT_UCLIBC_NG_PATCH_BUNDLED is not set
 # CT_UCLIBC_NG_PATCH_LOCAL is not set
@@ -466,7 +470,9 @@ CT_UCLIBC_NG_PATCH_GLOBAL=y
 # CT_UCLIBC_NG_PATCH_LOCAL_BUNDLED is not set
 # CT_UCLIBC_NG_PATCH_NONE is not set
 CT_UCLIBC_NG_PATCH_ORDER="global"
-CT_UCLIBC_NG_V_1_0_32=y
+CT_UCLIBC_NG_VERY_NEW=y
+# CT_UCLIBC_NG_V_1_0_33 is not set
+# CT_UCLIBC_NG_V_1_0_32 is not set
 # CT_UCLIBC_NG_V_1_0_31 is not set
 # CT_UCLIBC_NG_V_1_0_30 is not set
 # CT_UCLIBC_NG_V_1_0_29 is not set
@@ -474,8 +480,9 @@ CT_UCLIBC_NG_V_1_0_32=y
 # CT_UCLIBC_NG_V_1_0_27 is not set
 # CT_UCLIBC_NG_V_1_0_26 is not set
 # CT_UCLIBC_NG_V_1_0_25 is not set
+# CT_UCLIBC_NG_VERY_OLD is not set
 # CT_UCLIBC_NG_NO_VERSIONS is not set
-CT_UCLIBC_NG_VERSION="1.0.32"
+CT_UCLIBC_NG_VERSION="new"
 CT_UCLIBC_NG_MIRRORS="http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}"
 CT_UCLIBC_NG_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_UCLIBC_NG_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -565,20 +572,22 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-# CT_GCC_V_9 is not set
-CT_GCC_V_8=y
+CT_GCC_V_9=y
+# CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
 # CT_GCC_V_4_8 is not set
 # CT_GCC_NO_VERSIONS is not set
-CT_GCC_VERSION="8.3.0"
+CT_GCC_VERSION="9.2.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_8=y
+CT_GCC_8_or_later=y
 CT_GCC_later_than_7=y
 CT_GCC_7_or_later=y
 CT_GCC_later_than_6=y
@@ -695,6 +704,7 @@ CT_GMP_PATCH_GLOBAL=y
 # CT_GMP_PATCH_LOCAL_BUNDLED is not set
 # CT_GMP_PATCH_NONE is not set
 CT_GMP_PATCH_ORDER="global"
+# CT_GMP_V_6_2 is not set
 CT_GMP_V_6_1=y
 # CT_GMP_V_6_0 is not set
 # CT_GMP_V_5_1 is not set
@@ -849,6 +859,7 @@ CT_NCURSES_PATCH_GLOBAL=y
 # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
 # CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
+# CT_NCURSES_V_6_2 is not set
 CT_NCURSES_V_6_1=y
 # CT_NCURSES_V_6_0 is not set
 # CT_NCURSES_NO_VERSIONS is not set
diff --git a/archive-patches/ct-ng/ct-ng-uClibc-1.0.32.config b/archive-patches/ct-ng/ct-ng-uClibc-1.0.34.config
similarity index 98%
rename from archive-patches/ct-ng/ct-ng-uClibc-1.0.32.config
rename to archive-patches/ct-ng/ct-ng-uClibc-1.0.34.config
index 1db7a3a..a6cec54 100644
--- a/archive-patches/ct-ng/ct-ng-uClibc-1.0.32.config
+++ b/archive-patches/ct-ng/ct-ng-uClibc-1.0.34.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.32 C Library Configuration
+# uClibc-ng 1.0.34 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -246,4 +246,4 @@ DOSTRIP=y
 # UCLIBC_MALLOC_DEBUGGING is not set
 # UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
\ No newline at end of file
+# EXTRA_WARNINGS is not set
diff --git a/make/crosstool.mk b/make/crosstool.mk
index b98f55f..186625f 100755
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -40,7 +40,7 @@ crosstool: prerequisites | $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.g
 else ifeq ($(BOXSERIES), hd2)
 ## apollo / kronos crosstool ###############################################
 
-CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-git-7bd6bb0-gcc-8.3.0-hd2.config
+CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-git-5659366-gcc-9.2.0-hd2.config
 
 crosstool:
 	make MAKEFLAGS=--no-print-directory crosstool-ng
diff --git a/make/versions.mk b/make/versions.mk
index 326642a..f02afde 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -17,14 +17,14 @@ CORTEX_STRINGS_VER = 48fd30c
 
 # crosstool-ng versions
 CT_NG_VER_HD1 = 1894239
-CT_NG_VER_HD2 = 7bd6bb0
+CT_NG_VER_HD2 = 5659366
 CT_NG_VER_ARM = 7bd6bb0
 
 ETHTOOL_VER = 5.3
 
 # Linaro GCC Versions
 GCC_VER_HD1 = linaro-4.9-2017.01
-GCC_VER_HD2 = gcc-8.3.0
+GCC_VER_HD2 = gcc-9.2.0
 GCC_VER_ARM = gcc-9.2.0
 
 # Dropbear is a relatively small SSH server and client
@@ -249,7 +249,7 @@ TZ_VER=2017b
 U-BOOT_VER=2014.04
 
 # uClibc-ng; a C library for developing embedded Linux systems
-UCLIBC_VER=1.0.32
+UCLIBC_VER=1.0.34
 
 # NFS Server
 UNFS3_VER=0.9.22
-- 
2.39.5