From dab261a97b2de0cbcdeb9cca183114cd777f1824 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 18 Jan 2022 16:47:40 +1100
Subject: [PATCH] qemu-user-static: update to 6.2.0.

---
 srcpkgs/qemu-user-static/template | 34 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 7bccf271c74..59101021c53 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,18 +1,21 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
 wrksrc="qemu-${version}"
 build_style=configure
-hostmakedepends="pkg-config automake python3 ninja"
+configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
+ --disable-kvm --disable-vnc-png --disable-virtfs --disable-fdt --disable-seccomp
+ --enable-linux-user --disable-system --static"
+hostmakedepends="pkg-config perl python3 ninja"
 makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
 short_desc="QEMU User-mode emulators (statically compiled)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=6bc93a46361450b2c701c4f4e7cc81adc50e3ae0f2005b8f0fbf14fc23372a24
+checksum=2fde1a30a7dcc15dde0875319ecaf3dc249072dee46ba7ad1f7c8df1faece93f
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
@@ -86,6 +89,10 @@ _xtensa_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\x
 _xtensaeb_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x5e'
 _xtensaeb_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) _omit="i386|x86_64" ;;
 	aarch64*) _omit="aarch64" ;;
@@ -105,26 +112,11 @@ done
 
 binfmts="${binfmts%?}"
 
-post_extract() {
-	vsed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h
-}
-
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		_args="--cross-prefix=${XBPS_CROSS_TRIPLET}-"
-		export LIBTOOL=libtool
-	fi
+pre_configure() {
 	unset CPP
-
-	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec \
-		--disable-kvm --disable-vnc-png \
-		--disable-virtfs --disable-fdt --disable-seccomp \
-		--enable-linux-user --disable-system \
-		--static ${_args}
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} install
+post_install() {
 	# Remove unneeded stuff.
 	rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec
 	for f in nbd io img; do