[PR PATCH] glibc: explicitly override xbps architecture on i686/ppc/arm

[PR PATCH] glibc: explicitly override xbps architecture on i686/ppc/arm

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-power/void-packages glibc-32bit
https://github.com/void-linux/void-packages/pull/12036

glibc: explicitly override xbps architecture on i686/ppc/arm
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.

A patch file from https://github.com/void-linux/void-packages/pull/12036.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-32bit-12036.patch --]
[-- Type: application/text/x-diff, Size: 1387 bytes --]

From 8f92f02b4010562ccd5ac025924a9e01e020478a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 30 May 2019 16:51:55 +0200
Subject: [PATCH] glibc: explicitly override xbps architecture on i686/ppc/arm

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.
---
 srcpkgs/glibc/template | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index db4c5f025ea..90ec126ffab 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.29
-revision=5
+revision=6
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -171,6 +171,18 @@ do_install() {
 	rm -f ${DESTDIR}/usr/bin/z{dump,ic}
 
 	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() {

Re: [PR PATCH] [Closed]: glibc: explicitly override xbps architecture on i686/ppc/arm

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

There's a closed pull request on the void-packages repository

glibc: explicitly override xbps architecture on i686/ppc/arm
https://github.com/void-linux/void-packages/pull/12036
Description: 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.