From 47303c3ac8d30f63e822e39aca4fde23571d79c0 Mon Sep 17 00:00:00 2001
From: Niclas Hofmann <niclas@molgen.mpg.de>
Date: Mon, 5 Sep 2022 11:41:19 +0200
Subject: [PATCH] glibc: move rebuild of locale from glibc-locale into glibc

locale should be rebuild if glibc is rebuild. As yet, we
have to different bee-files (glibc.be0, glibc-locale.be0).
After talking to Donald I decided to put that into this
bee-file and remove the other because it has the advantage
of beeing explicit and you cannot forget to do it. Also
the version numbers indicated a link between these.
---
 glibc-locales.be0 | 24 ------------------------
 glibc.be0         | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100755 glibc-locales.be0

diff --git a/glibc-locales.be0 b/glibc-locales.be0
deleted file mode 100755
index b7b160d3d..000000000
--- a/glibc-locales.be0
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/env beesh
-
-# BEE_VERSION glibc-locales-2.33-0
-
-mee_install() {
-    mkdir -pv ${D}${LIBDIR}/locale
-    localedef --prefix=${D} -i cs_CZ -f UTF-8 cs_CZ.UTF-8
-    localedef --prefix=${D} -i de_DE -f ISO-8859-1 de_DE
-    localedef --prefix=${D} -i de_DE@euro -f ISO-8859-15 de_DE@euro
-    localedef --prefix=${D} -i de_DE -f UTF-8 de_DE.UTF-8
-    localedef --prefix=${D} -i en_HK -f ISO-8859-1 en_HK
-    localedef --prefix=${D} -i en_PH -f ISO-8859-1 en_PH
-    localedef --prefix=${D} -i en_US -f ISO-8859-1 en_US
-    localedef --prefix=${D} -i en_US -f UTF-8 en_US.UTF-8
-    localedef --prefix=${D} -i es_MX -f ISO-8859-1 es_MX
-    localedef --prefix=${D} -i fa_IR -f UTF-8 fa_IR
-    localedef --prefix=${D} -i fr_FR -f ISO-8859-1 fr_FR
-    localedef --prefix=${D} -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-    localedef --prefix=${D} -i fr_FR -f UTF-8 fr_FR.UTF-8
-    localedef --prefix=${D} -i it_IT -f ISO-8859-1 it_IT
-    localedef --prefix=${D} -i ja_JP -f EUC-JP ja_JP
-    localedef --prefix=${D} -i tr_TR -f UTF-8 tr_TR.UTF-8
-    localedef --prefix=${D} -i zh_CN -f GB18030 zh_CN.GB18030
-}
diff --git a/glibc.be0 b/glibc.be0
index fb0908645..b1cfea9f9 100755
--- a/glibc.be0
+++ b/glibc.be0
@@ -94,4 +94,23 @@ mee_install_post() {
     #
     mv $D/lib64/ld-linux-x86-64.so.${PKGVERSION[1]} $D/lib/
     rmdir $D/lib64
+
+    mkdir -pv ${D}${LIBDIR}/locale
+    localedef --prefix=${D} -i cs_CZ -f UTF-8 cs_CZ.UTF-8
+    localedef --prefix=${D} -i de_DE -f ISO-8859-1 de_DE
+    localedef --prefix=${D} -i de_DE@euro -f ISO-8859-15 de_DE@euro
+    localedef --prefix=${D} -i de_DE -f UTF-8 de_DE.UTF-8
+    localedef --prefix=${D} -i en_HK -f ISO-8859-1 en_HK
+    localedef --prefix=${D} -i en_PH -f ISO-8859-1 en_PH
+    localedef --prefix=${D} -i en_US -f ISO-8859-1 en_US
+    localedef --prefix=${D} -i en_US -f UTF-8 en_US.UTF-8
+    localedef --prefix=${D} -i es_MX -f ISO-8859-1 es_MX
+    localedef --prefix=${D} -i fa_IR -f UTF-8 fa_IR
+    localedef --prefix=${D} -i fr_FR -f ISO-8859-1 fr_FR
+    localedef --prefix=${D} -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
+    localedef --prefix=${D} -i fr_FR -f UTF-8 fr_FR.UTF-8
+    localedef --prefix=${D} -i it_IT -f ISO-8859-1 it_IT
+    localedef --prefix=${D} -i ja_JP -f EUC-JP ja_JP
+    localedef --prefix=${D} -i tr_TR -f UTF-8 tr_TR.UTF-8
+    localedef --prefix=${D} -i zh_CN -f GB18030 zh_CN.GB18030
 }