upg glibc
This commit is contained in:
parent
245741ef9e
commit
082847e152
3 changed files with 44 additions and 51 deletions
|
|
@ -11,8 +11,8 @@
|
|||
pkgbase=glibc
|
||||
pkgname=(glibc lib32-glibc)
|
||||
pkgver=2.36
|
||||
_commit=c804cd1c00adde061ca51711f63068c103e94eef
|
||||
pkgrel=03
|
||||
_commit=645d94808aaa90fb1b20a25ff70bb50d9eb1d55b
|
||||
pkgrel=04
|
||||
arch=(x86_64)
|
||||
url='https://www.gnu.org/software/libc'
|
||||
makedepends=(git gd lib32-gcc-libs python)
|
||||
|
|
@ -24,7 +24,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
|
|||
locale-gen
|
||||
lib32-glibc.conf
|
||||
sdt.h sdt-config.h
|
||||
disable-clone3.diff
|
||||
# disable-clone3.diff
|
||||
reenable_DT_HASH.patch
|
||||
)
|
||||
|
||||
|
|
@ -34,12 +34,6 @@ prepare() {
|
|||
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
||||
cd glibc
|
||||
|
||||
# Disable clone3 syscall for now
|
||||
# Can be removed when eletron{9,11,12} and discord are removed or patched:
|
||||
# https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574
|
||||
# Patch src: https://patchwork.ozlabs.org/project/glibc/patch/87eebkf8ph.fsf@oldenburg.str.redhat.com/
|
||||
patch -Np1 -i "${srcdir}"/disable-clone3.diff
|
||||
|
||||
# re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
|
||||
# which relies on DT_HASH to be present in these libs.
|
||||
# reconsider 2023-01
|
||||
|
|
@ -152,6 +146,7 @@ build() {
|
|||
#
|
||||
# make -O check
|
||||
#}
|
||||
#
|
||||
|
||||
package_glibc() {
|
||||
pkgdesc='GNU C Library w/o systemd'
|
||||
|
|
@ -184,6 +179,8 @@ package_glibc() {
|
|||
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"
|
||||
# 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"
|
||||
|
|
@ -233,5 +230,6 @@ sha256sums=(SKIP
|
|||
c27424154a6096ae32c0824b785e05de6acef33d9224fd6147d1936be9b4962b # lib32-glibc.conf
|
||||
774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70 # sdt.h
|
||||
cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0 # sdt-config.h
|
||||
f5df8fc95592cce7825744aeb8c9699a5b4b5b7ccf7bcf554355167c3a7e375e # disable-clone3.diff
|
||||
# f5df8fc95592cce7825744aeb8c9699a5b4b5b7ccf7bcf554355167c3a7e375e # disable-clone3.diff
|
||||
bb2fc5a38158d339a51a4aaab3fe2d5cc496221f77cfce6f74768db91cb5ec1e) # reenable_DT_HASH.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
pkgbase=glibc
|
||||
pkgname=(glibc lib32-glibc)
|
||||
pkgver=2.36
|
||||
_commit=c804cd1c00adde061ca51711f63068c103e94eef
|
||||
pkgrel=2
|
||||
_commit=645d94808aaa90fb1b20a25ff70bb50d9eb1d55b
|
||||
pkgrel=4
|
||||
arch=(x86_64)
|
||||
url='https://www.gnu.org/software/libc'
|
||||
license=(GPL LGPL)
|
||||
|
|
@ -21,18 +21,16 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
|
|||
locale-gen
|
||||
lib32-glibc.conf
|
||||
sdt.h sdt-config.h
|
||||
disable-clone3.diff
|
||||
reenable_DT_HASH.patch
|
||||
)
|
||||
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
|
||||
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
|
||||
b2sums=('SKIP'
|
||||
'46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6'
|
||||
'23c772feb247e6b5216b7962528617e53730267cb0913fd184edd6d3f59a4874ee7a864a56c48eb6e2936abadb30fc53166477b733a8a3e973932d79370c7b24'
|
||||
'04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
|
||||
'7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
|
||||
'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
|
||||
'214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
|
||||
'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52'
|
||||
'5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051')
|
||||
|
||||
prepare() {
|
||||
|
|
@ -41,12 +39,6 @@ prepare() {
|
|||
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
||||
cd glibc
|
||||
|
||||
# Disable clone3 syscall for now
|
||||
# Can be removed when eletron{9,11,12} and discord are removed or patched:
|
||||
# https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574
|
||||
# Patch src: https://patchwork.ozlabs.org/project/glibc/patch/87eebkf8ph.fsf@oldenburg.str.redhat.com/
|
||||
patch -Np1 -i "${srcdir}"/disable-clone3.diff
|
||||
|
||||
# re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
|
||||
# which relies on DT_HASH to be present in these libs.
|
||||
# reconsider 2023-01
|
||||
|
|
@ -69,7 +61,7 @@ build() {
|
|||
--disable-werror
|
||||
)
|
||||
|
||||
cd "$srcdir/glibc-build"
|
||||
cd "${srcdir}"/glibc-build
|
||||
|
||||
echo "slibdir=/usr/lib" >> configparms
|
||||
echo "rtlddir=/usr/lib" >> configparms
|
||||
|
|
@ -81,7 +73,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[@]}"
|
||||
|
|
@ -98,7 +90,7 @@ build() {
|
|||
# build info pages manually for reproducibility
|
||||
make info
|
||||
|
||||
cd "$srcdir/lib32-glibc-build"
|
||||
cd "${srcdir}"/lib32-glibc-build
|
||||
export CC="gcc -m32 -mstackrealign"
|
||||
export CXX="g++ -m32 -mstackrealign"
|
||||
|
||||
|
|
@ -107,7 +99,7 @@ build() {
|
|||
echo "sbindir=/usr/bin" >> configparms
|
||||
echo "rootsbindir=/usr/bin" >> configparms
|
||||
|
||||
"$srcdir/glibc/configure" \
|
||||
"${srcdir}"/glibc/configure \
|
||||
--host=i686-pc-linux-gnu \
|
||||
--libdir=/usr/lib32 \
|
||||
--libexecdir=/usr/lib32 \
|
||||
|
|
@ -170,38 +162,41 @@ package_glibc() {
|
|||
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
|
||||
}
|
||||
|
||||
package_lib32-glibc() {
|
||||
|
|
@ -211,19 +206,19 @@ package_lib32-glibc() {
|
|||
|
||||
cd lib32-glibc-build
|
||||
|
||||
make install_root="$pkgdir" install
|
||||
rm -rf "$pkgdir"/{etc,sbin,usr/{bin,sbin,share},var}
|
||||
make install_root="${pkgdir}" install
|
||||
rm -rf "${pkgdir}"/{etc,sbin,usr/{bin,sbin,share},var}
|
||||
|
||||
# We need to keep 32 bit specific header files
|
||||
find "$pkgdir/usr/include" -type f -not -name '*-32.h' -delete
|
||||
find "${pkgdir}"/usr/include -type f -not -name '*-32.h' -delete
|
||||
|
||||
# Dynamic linker
|
||||
install -d "$pkgdir/usr/lib"
|
||||
ln -s ../lib32/ld-linux.so.2 "$pkgdir/usr/lib/"
|
||||
install -d "${pkgdir}"/usr/lib
|
||||
ln -s ../lib32/ld-linux.so.2 "${pkgdir}"/usr/lib/
|
||||
|
||||
# Add lib32 paths to the default library search path
|
||||
install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
|
||||
install -Dm644 "${srcdir}"/lib32-glibc.conf "${pkgdir}"/etc/ld.so.conf.d/lib32-glibc.conf
|
||||
|
||||
# Symlink /usr/lib32/locale to /usr/lib/locale
|
||||
ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
|
||||
ln -s ../lib/locale "${pkgdir}"/usr/lib32/locale
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ gd
|
|||
lib32-gcc-libs
|
||||
python
|
||||
bison
|
||||
|
||||
|
||||
libjpeg-turbo
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue