core/glibc to 2.36-4

This commit is contained in:
Kevin Mihelich 2022-09-11 16:22:46 +00:00
parent 8efeb0a5ee
commit 6a2cccf69f
2 changed files with 27 additions and 30 deletions

View file

@ -16,8 +16,8 @@ noautobuild=1
pkgname=glibc
pkgver=2.36
_commit=e982657073c4db21459ffd9e17bc505b1d64b876
pkgrel=3
_commit=645d94808aaa90fb1b20a25ff70bb50d9eb1d55b
pkgrel=4
arch=(x86_64)
url='https://www.gnu.org/software/libc'
license=(GPL LGPL)
@ -32,7 +32,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
b2sums=('SKIP'
'46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6'
'23c772feb247e6b5216b7962528617e53730267cb0913fd184edd6d3f59a4874ee7a864a56c48eb6e2936abadb30fc53166477b733a8a3e973932d79370c7b24'
'04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
'214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
@ -64,7 +64,7 @@ build() {
--disable-werror
)
cd "$srcdir/glibc-build"
cd "${srcdir}"/glibc-build
# ALARM: Specify build host types
[[ $CARCH == "armv7h" ]] && _configure_flags+=(--host=armv7l-unknown-linux-gnueabihf --build=armv7l-unknown-linux-gnueabihf)
@ -80,7 +80,7 @@ build() {
# remove fortify for building libraries
CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}
"$srcdir/glibc/configure" \
"${srcdir}"/glibc/configure \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
"${_configure_flags[@]}"
@ -145,36 +145,39 @@ package() {
etc/locale.gen
etc/nscd.conf)
make -C glibc-build install_root="$pkgdir" install
rm -f "$pkgdir"/etc/ld.so.cache
make -C glibc-build install_root="${pkgdir}" install
rm -f "${pkgdir}"/etc/ld.so.cache
# Shipped in tzdata
rm -f "$pkgdir"/usr/bin/{tzselect,zdump,zic}
rm -f "${pkgdir}"/usr/bin/{tzselect,zdump,zic}
cd glibc
install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d}
install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf"
install -m644 nscd/nscd.service "$pkgdir/usr/lib/systemd/system"
install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf"
install -dm755 "$pkgdir/var/db/nscd"
install -dm755 "${pkgdir}"/usr/lib/{locale,systemd/system,tmpfiles.d}
install -m644 nscd/nscd.conf "${pkgdir}"/etc/nscd.conf
install -m644 nscd/nscd.service "${pkgdir}"/usr/lib/systemd/system
install -m644 nscd/nscd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/nscd.conf
install -dm755 "${pkgdir}"/var/db/nscd
install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf
install -m644 posix/gai.conf "${pkgdir}"/etc/gai.conf
install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin"
install -m755 "${srcdir}"/locale-gen "${pkgdir}"/usr/bin
# Create /etc/locale.gen
install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen"
install -m644 "${srcdir}"/locale.gen.txt "${pkgdir}"/etc/locale.gen
sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
"$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
"${srcdir}"/glibc/localedata/SUPPORTED >> "${pkgdir}"/etc/locale.gen
# Add SUPPORTED file
install -m644 "${srcdir}"/glibc/localedata/SUPPORTED "${pkgdir}"/usr/share/i18n/SUPPORTED
# install C.UTF-8 so that it is always available
install -dm755 "$pkgdir/usr/lib/locale"
cp -r "$srcdir/C.UTF-8" -t "$pkgdir/usr/lib/locale"
sed -i '/#C\.UTF-8 /d' "$pkgdir/etc/locale.gen"
install -dm755 "${pkgdir}"/usr/lib/locale
cp -r "${srcdir}"/C.UTF-8 -t "${pkgdir}"/usr/lib/locale
sed -i '/#C\.UTF-8 /d' "${pkgdir}"/etc/locale.gen
# Provide tracing probes to libstdc++ for exceptions, possibly for other
# libraries too. Useful for gdb's catch command.
install -Dm644 "$srcdir/sdt.h" "$pkgdir/usr/include/sys/sdt.h"
install -Dm644 "$srcdir/sdt-config.h" "$pkgdir/usr/include/sys/sdt-config.h"
install -Dm644 "${srcdir}"/sdt.h "${pkgdir}"/usr/include/sys/sdt.h
install -Dm644 "${srcdir}"/sdt-config.h "${pkgdir}"/usr/include/sys/sdt-config.h
}

View file

@ -9,15 +9,9 @@
# where <locale> is one of the locales given in /usr/share/i18n/locales
# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
#
# Examples:
# en_US ISO-8859-1
# en_US.UTF-8 UTF-8
# de_DE ISO-8859-1
# de_DE@euro ISO-8859-15
#
# The locale-gen command will generate all the locales,
# placing them in /usr/lib/locale.
#
# A list of supported locales is included in this file.
# Uncomment the ones you need.
# A list of supported locales is given in /usr/share/i18n/SUPPORTED
# and is included in this file. Uncomment the needed locales below.
#