From 3dcb73a4d0de89ff519c20e30d58156633d9fc98 Mon Sep 17 00:00:00 2001
From: Lukas Martini <hello@lutoma.org>
Date: Thu, 16 Nov 2023 01:51:07 +0100
Subject: [PATCH] Sync toolchain newlib flags with userland version

---
 Containerfile                |  7 ++++++-
 land/libiconv/PKGBUILD       | 34 ----------------------------------
 land/libiconv/libiconv.patch | 22 ----------------------
 3 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 land/libiconv/PKGBUILD
 delete mode 100644 land/libiconv/libiconv.patch

diff --git a/Containerfile b/Containerfile
index fc596991..8f9f61dd 100644
--- a/Containerfile
+++ b/Containerfile
@@ -89,7 +89,12 @@ WORKDIR /build/newlib
 RUN /usr/src/newlib-${NEWLIB_VERSION}/configure \
 	--target=${TARGET} \
 	--prefix=/usr \
-	--sysconfdir=/etc
+	--sysconfdir=/etc \
+	--enable-newlib-mb \
+	--enable-newlib-iconv \
+	--enable-newlib-io-c99-formats \
+	--enable-newlib-io-long-long \
+	--enable-newlib-io-long-double
 
 WORKDIR /build/gcc
 RUN /usr/src/gcc-${GCC_VERSION}/configure \
diff --git a/land/libiconv/PKGBUILD b/land/libiconv/PKGBUILD
deleted file mode 100644
index 04293c29..00000000
--- a/land/libiconv/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=libiconv
-pkgver=1.16
-pkgrel=1
-pkgdesc="This library provides an iconv() implementation, for use on systems which don't have one, or whose implementation cannot convert from/to Unicode."
-arch=('i786')
-url="https://www.gnu.org/software/libiconv/"
-source=(
-	'https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz'
-	'libiconv.patch'
-)
-sha256sums=(
-	'e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04'
-	'SKIP'
-)
-
-prepare() {
-	cd $pkgname-$pkgver
-	patch -p0 < ../$pkgname.patch
-}
-
-build() {
-	cd $pkgname-$pkgver
-	./configure \
-		--host=i786-pc-xelix \
-		--prefix=/usr \
-		--sysconfdir=/etc
-
-	make
-}
-
-package() {
-	cd $pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-}
diff --git a/land/libiconv/libiconv.patch b/land/libiconv/libiconv.patch
deleted file mode 100644
index 082388db..00000000
--- a/land/libiconv/libiconv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- build-aux/config.sub	2020-01-30 00:50:56.402769882 +0100
-+++ build-aux/config.sub	2020-01-30 00:51:08.986070324 +0100
-@@ -1367,7 +1367,7 @@ case $os in
- 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
--	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
-+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | xelix*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	qnx*)
---- libcharset/build-aux/config.sub	2020-01-30 00:51:17.956046980 +0100
-+++ libcharset/build-aux/config.sub	2020-01-30 00:51:25.249361387 +0100
-@@ -1367,7 +1367,7 @@ case $os in
- 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
--	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
-+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | xelix*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	qnx*)