Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages / glibc
Commits: e1f1ee93 by Toolybird at 2024-04-30T15:44:36+10:00 Switch to .install files for gconv-modules.cache generation Tested by observing strace output when running iconv. Related to https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/issues/8 - - - - - 4 changed files: - .SRCINFO - PKGBUILD - glibc.install - + lib32-glibc.install Changes: ===================================== .SRCINFO ===================================== @@ -39,6 +39,7 @@ pkgname = glibc pkgname = lib32-glibc pkgdesc = GNU C Library (32-bit) + install = lib32-glibc.install depends = glibc=2.39 options = staticlibs options = !lto ===================================== PKGBUILD ===================================== @@ -146,11 +146,6 @@ package_glibc() { backup=(etc/gai.conf etc/locale.gen) - # make automatically re-generates the gconv modules cache - # if the file is present - install -dm755 "${pkgdir}"/usr/lib/gconv - touch "${pkgdir}"/usr/lib/gconv/gconv-modules.cache - make -C glibc-build DESTDIR="${pkgdir}" install rm -f "${pkgdir}"/etc/ld.so.cache @@ -192,6 +187,7 @@ package_lib32-glibc() { pkgdesc='GNU C Library (32-bit)' depends=("glibc=$pkgver") options+=('!emptydirs') + install=lib32-glibc.install cd lib32-glibc-build ===================================== glibc.install ===================================== @@ -2,4 +2,6 @@ post_upgrade() { locale-gen ldconfig -r . + + iconvconfig } ===================================== lib32-glibc.install ===================================== @@ -0,0 +1,11 @@ +post_install() { + post_upgrade +} + +post_upgrade() { + iconvconfig --nostdlib -o /usr/lib32/gconv/gconv-modules.cache /usr/lib32/gconv +} + +pre_remove() { + rm -f /usr/lib32/gconv/gconv-modules.cache +} View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/commit/e1f1ee93feaaef9e1ae8e19d77795f0b9b5c0bff -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/commit/e1f1ee93feaaef9e1ae8e19d77795f0b9b5c0bff You're receiving this email because of your account on gitlab.archlinux.org.
