From 8b090ab6e478bf3135cc4e8e78c1dc937e7f1366 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Mon, 29 Dec 2025 02:51:08 -0500 Subject: [PATCH] fix: fix lfs/glibc, move localdef to postinstall --- lfs/glibc-2.42.PKGBUILD | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/lfs/glibc-2.42.PKGBUILD b/lfs/glibc-2.42.PKGBUILD index fef7683..6832eef 100644 --- a/lfs/glibc-2.42.PKGBUILD +++ b/lfs/glibc-2.42.PKGBUILD @@ -64,6 +64,29 @@ src_install() { make DESTDIR="${pkgdir}" install sed '/RTLDLIST=/s@/usr@@g' -i "${pkgdir}/usr/bin/ldd" + install -m644 "${distdir}/${sources[2]}" "${pkgdir}/etc/nsswitch.conf" + + tar -xf "${distdir}/${sources[4]}" + ZONEINFO=${pkgdir}/usr/share/zoneinfo + mkdir -pv $ZONEINFO/{posix,right} + for tz in etcetera southamerica northamerica europe africa antarctica \ + asia australasia backward; do + zic -L /dev/null -d $ZONEINFO ${tz} + zic -L /dev/null -d $ZONEINFO/posix ${tz} + zic -L leapseconds -d $ZONEINFO/right ${tz} + done + cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO + zic -d $ZONEINFO -p America/New_York + unset ZONEINFO + + install -m644 "${distdir}/${sources[3]}" "${pkgdir}/etc/ld.so.conf" +} + +src_preinstall() { + install -vm755 "${pkgdir}"/usr/lib/*.so.* /usr/lib +} + +src_postinstall() { localedef -i C -f UTF-8 C.UTF-8 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8 localedef -i de_DE -f ISO-8859-1 de_DE @@ -100,25 +123,4 @@ src_install() { localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS localedef -i zh_TW -f UTF-8 zh_TW.UTF-8 localedef -i zh_CN -f UTF-8 zh_CN.UTF-8 - - install -m644 "${distdir}/${sources[2]}" "${pkgdir}/etc/nsswitch.conf" - - tar -xf "${distdir}/${sources[4]}" - ZONEINFO=${pkgdir}/usr/share/zoneinfo - mkdir -pv $ZONEINFO/{posix,right} - for tz in etcetera southamerica northamerica europe africa antarctica \ - asia australasia backward; do - zic -L /dev/null -d $ZONEINFO ${tz} - zic -L /dev/null -d $ZONEINFO/posix ${tz} - zic -L leapseconds -d $ZONEINFO/right ${tz} - done - cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO - zic -d $ZONEINFO -p America/New_York - unset ZONEINFO - - install -m644 "${distdir}/${sources[3]}" "${pkgdir}/etc/ld.so.conf" -} - -src_preinstall() { - install -vm755 "${pkgdir}"/usr/lib/*.so.* /usr/lib }