[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/, sys-libs/glibc/files/

[Andreas K. Hüttel]

commit:     60d807b9d77cb7058356b6a0b8fe920160dc4080
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 20:32:06 2025 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 20:38:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d807b9

sys-libs/glibc: add utmp fix for m68k with -maligned-int

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/files/glibc-2.41-m68k-malign.patch | 14 ++++++++++++++
 sys-libs/glibc/glibc-2.41-r2.ebuild               |  9 +++++++++
 sys-libs/glibc/glibc-9999.ebuild                  |  9 +++++++++
 3 files changed, 32 insertions(+)

diff --git a/sys-libs/glibc/files/glibc-2.41-m68k-malign.patch 
b/sys-libs/glibc/files/glibc-2.41-m68k-malign.patch
new file mode 100644
index 000000000000..4db3ccd0716a
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.41-m68k-malign.patch
@@ -0,0 +1,14 @@
+
+Found by Adrian Glaubitz (cbmuser)
+
+diff --git a/sysdeps/m68k/utmp-size.h b/sysdeps/m68k/utmp-size.h
+index 5946685819..8f21ebe1b6 100644
+--- a/sysdeps/m68k/utmp-size.h
++++ b/sysdeps/m68k/utmp-size.h
+@@ -1,3 +1,2 @@
+-/* m68k has 2-byte alignment.  */
+-#define UTMP_SIZE 382
++#define UTMP_SIZE 384
+ #define LASTLOG_SIZE 292
+
+

diff --git a/sys-libs/glibc/glibc-2.41-r2.ebuild 
b/sys-libs/glibc/glibc-2.41-r2.ebuild
index de7c10771d75..25bdeed5154e 100644
--- a/sys-libs/glibc/glibc-2.41-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.41-r2.ebuild
@@ -972,6 +972,15 @@ src_prepare() {
                einfo "Done."
        fi
 
+        case ${CTARGET} in
+                m68*-aligned-*)
+                       einfo "Applying utmp format fix for m68k with 
-maligned-int"
+                       eapply "${FILESDIR}/glibc-2.41-m68k-malign.patch"
+                       ;;
+                *)
+                       ;;
+        esac
+
        default
 
        gnuconfig_update

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index f1adca0c21cf..e23e2568a764 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -972,6 +972,15 @@ src_prepare() {
                einfo "Done."
        fi
 
+        case ${CTARGET} in
+                m68*-aligned-*)
+                       einfo "Applying utmp format fix for m68k with 
-maligned-int"
+                       eapply "${FILESDIR}/glibc-2.41-m68k-malign.patch"
+                       ;;
+                *)
+                       ;;
+        esac
+
        default
 
        gnuconfig_update