From a6e927528129cc871f7e72d68c15592e5f8e84fe Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Sat, 22 Nov 2025 17:08:33 +0100
Subject: [PATCH] Fix bootstrap build for arm and arm64

- Update texinfo to 7.2
- Update bash to 5.3
- Update ICU to 70.1

These versions are patched in haikuports.cross and allow cross compiling
from Debian sid with a modern GCC. Confirmed that both architectures can
build a filesystem, kernel and bootloader.
---
 build/jam/BuildFeatures                      | 15 +++++++++++++++
 build/jam/repositories/HaikuPortsCross/arm   |  8 ++++----
 build/jam/repositories/HaikuPortsCross/arm64 |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index b2f4141846..742952b8a6 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -126,6 +126,21 @@ if [ IsPackageAvailable icu_devel ] {
 			headers: $(developHeadersDir)
 		;
 
+	EnableBuildFeatures icu ;
+} else if [ IsPackageAvailable icu70_devel ] {
+	ExtractBuildFeatureArchives icu :
+		file: base icu70
+			runtime: lib
+		file: devel icu70_devel
+			depends: base
+			libraries:
+				$(developLibDir)/libicudata.so
+				$(developLibDir)/libicui18n.so
+				$(developLibDir)/libicuio.so
+				$(developLibDir)/libicuuc.so
+			headers: $(developHeadersDir)
+		;
+
 	EnableBuildFeatures icu ;
 } else {
 	unavailableBuildFeatures += icu ;
diff --git a/build/jam/repositories/HaikuPortsCross/arm b/build/jam/repositories/HaikuPortsCross/arm
index c882d989f0..6482c9d293 100644
--- a/build/jam/repositories/HaikuPortsCross/arm
+++ b/build/jam/repositories/HaikuPortsCross/arm
@@ -11,7 +11,7 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap_syslibs_devel-13.2.0_2023_08_10-1
 	:
 	# repository architecture packages (stage 1)
-	bash_bootstrap-4.4.023-1
+	bash_bootstrap-5.3-1
 	binutils_bootstrap-2.41_2023_08_05-1
 	bison_bootstrap-3.0.5-1
 	coreutils_bootstrap-8.22-1
@@ -25,8 +25,8 @@ BootstrapPackageRepository HaikuPortsCross
 	freetype_bootstrap_devel-2.6.3-1
 	gawk_bootstrap-3.1.8-2
 	grep_bootstrap-2.14-1
-	icu_bootstrap-57.2-1
-	icu_bootstrap_devel-57.2-1
+	icu70_bootstrap-70.1-1
+	icu70_bootstrap_devel-70.1-1
 	less_bootstrap-451-1
 	libffi_bootstrap-3.3-1
 	m4_bootstrap-1.4.19-1
@@ -35,7 +35,7 @@ BootstrapPackageRepository HaikuPortsCross
 	ncurses6_bootstrap_devel-6.2-1
 	python_bootstrap-3.9.1-1
 	sed_bootstrap-4.2.1-1
-	texinfo_bootstrap-4.13a-1
+	texinfo_bootstrap-7.2-1
 	zlib_bootstrap-1.2.13-1
 	zlib_bootstrap_devel-1.2.13-1
 	zstd_bootstrap-1.5.5-1
diff --git a/build/jam/repositories/HaikuPortsCross/arm64 b/build/jam/repositories/HaikuPortsCross/arm64
index 7f89e368e0..9c3f6ef6ea 100644
--- a/build/jam/repositories/HaikuPortsCross/arm64
+++ b/build/jam/repositories/HaikuPortsCross/arm64
@@ -35,7 +35,7 @@ BootstrapPackageRepository HaikuPortsCross
 	ncurses6_bootstrap_devel-6.2-1
 	python_bootstrap-3.9.1-1
 	sed_bootstrap-4.2.1-1
-	texinfo_bootstrap-4.13a-1
+	texinfo_bootstrap-7.2-1
 	zlib_bootstrap-1.2.13-1
 	zlib_bootstrap_devel-1.2.13-1
 	zstd_bootstrap-1.5.5-1