wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glibc: explicitly override xbps architecture on i686/ppc/arm

Browse source 
This is in order to fix xbps when running on 64-bit kernels with
32-bit userland style setups. Musl already does this in order
to append the -musl suffix, so no fix there necessary.

Closes: #12036 [via git-merge-pr]
This commit is contained in:
q66 2019-05-30 16:51:55 +02:00 • committed by Jürgen Buchmüller
parent 0600d0af3b
commit 1baa22b678
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/glibc/template
View file

@ -1,7 +1,7 @@
# Template file for 'glibc' # Template file for 'glibc'
pkgname=glibc pkgname=glibc
version=2.29 version=2.29
revision=5 revision=6
bootstrap=yes bootstrap=yes
short_desc="GNU C library" short_desc="GNU C library"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
@ -171,6 +171,18 @@ do_install() {
rm -f ${DESTDIR}/usr/bin/z{dump,ic} rm -f ${DESTDIR}/usr/bin/z{dump,ic}
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
# Create xbps.d(5) arch override file for 32-bit architectures
# 32-bit userlands may be used with 64-bit kernels and then
# xbps will report an incorrect architecture by default
case "$XBPS_TARGET_MACHINE" in
i686|ppc|armv*)
vmkdir usr/share/xbps.d
echo "architecture=${XBPS_TARGET_MACHINE}" > \
${DESTDIR}/usr/share/xbps.d/arch-32bit.conf
;;
*) ;;
esac
} }
glibc-devel_package() { glibc-devel_package() {