From 1d5a66bc27796acf1463ee8050d7d7126d734d84 Mon Sep 17 00:00:00 2001
From: Niclas Hofmann <niclas@molgen.mpg.de>
Date: Fri, 5 Aug 2022 14:00:36 +0200
Subject: [PATCH 1/3] glibc: Update version from 2.33 to 2.36

---
 glibc.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glibc.be0 b/glibc.be0
index fc947eb44..ef8bdc8bc 100755
--- a/glibc.be0
+++ b/glibc.be0
@@ -1,6 +1,6 @@
 #!/bin/env beesh
 
-# BEE_VERSION glibc-2.33-0
+# BEE_VERSION glibc-2.36-0
 
 SRCURL[0]="https://ftp.gnu.org/gnu/glibc/glibc-${PKGVERSION}.tar.bz2"
 

From f590df825c599d960a6d5b015303f8c7bf66de1d Mon Sep 17 00:00:00 2001
From: Niclas Hofmann <niclas@molgen.mpg.de>
Date: Fri, 5 Aug 2022 16:26:58 +0200
Subject: [PATCH 2/3] glibc: Adapt ld-linux install code for 2.36

In former versions the file ld-linux-x86-64.so.2 in /lib64
was a symlink and therefore could be removed. Now it is the
real shared object and should be kept or rather moved to
/lib.
---
 glibc.be0 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/glibc.be0 b/glibc.be0
index ef8bdc8bc..fb0908645 100755
--- a/glibc.be0
+++ b/glibc.be0
@@ -89,10 +89,9 @@ mee_install_post() {
         cd -
     fi
 
-    # "make install" created (e.g.) /lib64/ld-linux-x86-64.so.2 -> ../lib/ld-2.26.so
-    # we have /lib64 -> /lib , so remove the lib64 directory and create a new link
+    # "make install" created (e.g.) /lib64/ld-linux-x86-64.so.2
+    # we have /lib64 -> /lib , so move the lib and remove the lib64 directory
     #
-    rm $D/lib64/ld-linux-x86-64.so.${PKGVERSION[1]}
+    mv $D/lib64/ld-linux-x86-64.so.${PKGVERSION[1]} $D/lib/
     rmdir $D/lib64
-    ln -s ld-$PKGVERSION.so $D/lib/ld-linux-x86-64.so.${PKGVERSION[1]}
 }

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 3/3] 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
 }