From 0f368c41854241d12e6dc64454df45ae32157166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 27 Feb 2021 22:34:12 +0100
Subject: [PATCH 1/2] glibc: add INSTALL hook to make gconv module cache

---
 srcpkgs/glibc/INSTALL  | 8 ++++++++
 srcpkgs/glibc/template | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glibc/INSTALL

diff --git a/srcpkgs/glibc/INSTALL b/srcpkgs/glibc/INSTALL
new file mode 100644
index 000000000000..c6b459be99c4
--- /dev/null
+++ b/srcpkgs/glibc/INSTALL
@@ -0,0 +1,8 @@
+# Build iconv module cache
+#
+case "${ACTION}" in
+post)
+	echo "Generating iconv module cache..."
+	iconvconfig --nostdlib --prefix="$(pwd)" usr/lib/gconv
+	;;
+esac
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index c62a4d2aedf1..4a2f0e019e0c 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.32
-revision=2
+revision=3
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c437599bc656d720e4c34ef4dedf242aa0130bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 6 Mar 2021 13:21:23 +0100
Subject: [PATCH 2/2] glibc: break out glibc-gconv

---
 srcpkgs/glibc-gconv                            |  1 +
 srcpkgs/glibc/{INSTALL => glibc-gconv.INSTALL} |  0
 srcpkgs/glibc/template                         | 11 +++++++++++
 3 files changed, 12 insertions(+)
 create mode 120000 srcpkgs/glibc-gconv
 rename srcpkgs/glibc/{INSTALL => glibc-gconv.INSTALL} (100%)

diff --git a/srcpkgs/glibc-gconv b/srcpkgs/glibc-gconv
new file mode 120000
index 000000000000..0c4c137d7ca7
--- /dev/null
+++ b/srcpkgs/glibc-gconv
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/srcpkgs/glibc/INSTALL b/srcpkgs/glibc/glibc-gconv.INSTALL
similarity index 100%
rename from srcpkgs/glibc/INSTALL
rename to srcpkgs/glibc/glibc-gconv.INSTALL
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 4a2f0e019e0c..eac1667ce1c7 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -49,6 +49,7 @@ conf_files="
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison gettext perl python3 texinfo"
 fi
+depends="glibc-gconv"
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"
 lib32symlinks="ld-linux.so.2"
@@ -191,6 +192,16 @@ glibc-devel_package() {
 		fi
 	}
 }
+
+glibc-gconv_package() {
+	depends="glibc>=${version}_${revision}"
+	short_desc+=" - gconv modules"
+	pkg_install() {
+		vmove "usr/lib/gconv"
+		vmove "usr/bin/iconvconfig"
+	}
+}
+
 glibc-locales_package() {
 	conf_files="/etc/default/libc-locales"
 	short_desc+=" - locale data files"