moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

glibc: clean up install, add C.UTF-8 locale by default

Browse source
This commit is contained in:
Andrew J. Hesford 2024-03-06 08:46:43 -05:00
parent 0dbfe6386d
commit a4294cdf8c
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
srcpkgs/glibc/template
View file

@ -1,7 +1,7 @@
# Template file for 'glibc' # Template file for 'glibc'
pkgname=glibc pkgname=glibc
version=2.38 version=2.38
revision=5 revision=6
bootstrap=yes bootstrap=yes
short_desc="GNU C library" short_desc="GNU C library"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -123,23 +123,38 @@ do_build() {
env LDFLAGS.so="-Wl,--hash-style=both" LDFLAGS-rtld="-Wl,--hash-style=both" \ env LDFLAGS.so="-Wl,--hash-style=both" LDFLAGS-rtld="-Wl,--hash-style=both" \
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
vlicense LICENSES vlicense LICENSES
# Create DESTDIR/etc/ld.so.conf # Create DESTDIR/etc/ld.so.conf
mkdir -p ${DESTDIR}/etc mkdir -p ${DESTDIR}/etc
echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
cd build ( cd build && make install_root=${DESTDIR} install )
make install_root=${DESTDIR} install
# The C.UTF-8 locale should always be available
if [ -z "${CROSS_BUILD}" ]; then
make -C localedata DESTDIR="${DESTDIR}" \
objdir="../build" install-files-C.UTF-8/UTF-8
else
local endian=
case "$XBPS_TARGET_ENDIAN" in
be) endian="--big-endian" ;;
le) endian="--little-endian" ;;
esac
vmkdir usr/lib/locale
I18NPATH=./localedata localedef --prefix="${DESTDIR}" ${endian} \
-i C -f UTF-8 --no-archive "${DESTDIR}/usr/lib/locale/C.utf8"
fi
# create /etc/default/libc-locales # create /etc/default/libc-locales
vinstall ${FILESDIR}/libc-locales 644 etc/default vinstall ${FILESDIR}/libc-locales 644 etc/default
cp ${wrksrc}/localedata/SUPPORTED ${wrksrc}/build sed -e "s|/| |g" \
sed -i -e "s|/| |g" \
-e 's|\\| |g' \ -e 's|\\| |g' \
-e "s|SUPPORTED-LOCALES=||" \ -e "s|SUPPORTED-LOCALES=||" \
-e "s|^|#|g" ${wrksrc}/build/SUPPORTED -e "s|^|#|g" localedata/SUPPORTED \
cat ${wrksrc}/build/SUPPORTED >> ${DESTDIR}/etc/default/libc-locales >> "${DESTDIR}/etc/default/libc-locales"
# ldd is a bash script, so make it run as such. # ldd is a bash script, so make it run as such.
replace_interpreter bash ${DESTDIR}/usr/bin/ldd replace_interpreter bash ${DESTDIR}/usr/bin/ldd
@ -162,7 +177,7 @@ do_install() {
armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;; armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;;
esac esac
vinstall ${wrksrc}/posix/gai.conf 644 etc vinstall posix/gai.conf 644 etc
rm -rf ${DESTDIR}/var/db rm -rf ${DESTDIR}/var/db
# Remove tzselect and z{dump,ic}, provided by tzutils. # Remove tzselect and z{dump,ic}, provided by tzutils.
rm -f ${DESTDIR}/usr/bin/tzselect rm -f ${DESTDIR}/usr/bin/tzselect
@ -185,6 +200,7 @@ glibc-devel_package() {
fi fi
} }
} }
glibc-locales_package() { glibc-locales_package() {
conf_files="/etc/default/libc-locales" conf_files="/etc/default/libc-locales"
short_desc+=" - locale data files" short_desc+=" - locale data files"
@ -194,6 +210,7 @@ glibc-locales_package() {
vmove usr/share/locale vmove usr/share/locale
} }
} }
nscd_package() { nscd_package() {
conf_files="/etc/nscd.conf" conf_files="/etc/nscd.conf"
short_desc+=" - Name Service Cache Daemon" short_desc+=" - Name Service Cache Daemon"