From nobody Fri Dec 9 19:32:34 2022
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NTLl643PJz4k6HY;
Fri, 9 Dec 2022 19:32:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4NTLl632d8z3lbS;
Fri, 9 Dec 2022 19:32:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1670614354;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9ZyAROHqMIb2RcM04N+2Ql/b2GaOyVPGMRmHEjbgjC4=;
b=x49EuqI+YPkM1qKjH8HmnTQAmRHFGm69FIlSeeEiDrYRUuO98/0+HGxL2PhwMJDw1CPIHY
tzTTiPL2HBx1UKTJrr7+5ROHNLXeEFU0oVpjsOkGWI9RgW0cUFs4p+X+edP/oudFo6RrSK
Y0ikcjjJIHsK30bo/cDJY/WE+VOVr/ed3F9Nb1dC0WH3eNwJ++yi4ih6oDJHize9dA0lTN
/lkcTMOVMWhgDlE+d8ad5UXBC6r/A+fJ/lfqgcTXXx0rq2v04Rcu4Ot37cn1HUw5TeIo1p
8nkRVCXzvP3musANqdJ5auRGr3oiGa6A+YuB7zQMyDEEtibWnrWAkFwYKmAOUw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1670614354;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9ZyAROHqMIb2RcM04N+2Ql/b2GaOyVPGMRmHEjbgjC4=;
b=QEIDZJcQbNgFfkR9ybBLT0oVvZjZrR60vwwETF251rnugDiS1vzWkPaXXilrQvMGqIJRXO
b+8d2Wr1WEcKuXRZvNqOxNz6O8aI7+WsJmdOAx+XjCEQb/zs0R4tpsZwNLSfl4PZLxelbF
qF8Fj+FWhiAv2BZ34VnKMdy1/e/OIulWcI1iNRdDiO1a0TMkE+coxdq6dvYlYw3+qQWgak
K3D4NNtjCJnjBYuVmcS8Ru4unbOkpsITxabpIItPzgCxxs114CEz5FH4HqytNnYJ7id4mS
bvr/ozDCvRMENqUrfN0j/Kz+PtYZ/YjV1ntNTU8Ccg06Xzjt/+8TJ1avkUzXUA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670614354; a=rsa-sha256; cv=none;
b=QY66r3N8p3NH+HBxirzemB8I1+CrVuHRIKWNKRgcvsN2+gGzogmaA9F3XueHghr829S/Hl
ZkXAtmChL6cKvkV390eCXE7kgfZ3YFsNCG2dD2caukMA5gzr9smWLNgdaZBNCtoPHSvW7o
Y5Y7/I++o0bp6XW2WsNjFfnctR1BcFrbNXR0WqS9zagKu39gVvD63slvnowmYm6s7NGemq
mNUqfSg2cqfyNUXzLq1B7CVD8Usi4dSZJHkcRUuaB62cISsyWZvSZMI8r5RxgvvJzHUjGl
G9CaZq9WJj1KEPkeLjeZmF/Xoa0hanVccP06GCozvmn7DhPuTvwbigCUHzUYxw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NTLl625mDznwY;
Fri, 9 Dec 2022 19:32:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B9JWYRZ014909;
Fri, 9 Dec 2022 19:32:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9JWYJ3014908;
Fri, 9 Dec 2022 19:32:34 GMT
(envelope-from git)
Date: Fri, 9 Dec 2022 19:32:34 GMT
Message-Id: <202212091932.2B9JWYJ3014908@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Kevin Bowling <kbowling@FreeBSD.org>
Subject: git: a93f9e4117c5 - main - emulators/qemu-powernv: Fix build on armv7
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kbowling
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a93f9e4117c5d55a036c92a7dee7ff23180d3c57
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by kbowling:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a93f9e4117c5d55a036c92a7dee7ff23180d3c57
commit a93f9e4117c5d55a036c92a7dee7ff23180d3c57
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-12-09 19:31:25 +0000
Commit: Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2022-12-09 19:32:28 +0000
emulators/qemu-powernv: Fix build on armv7
PR: 268225
---
emulators/qemu-powernv/files/patch-configure | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/emulators/qemu-powernv/files/patch-configure b/emulators/qemu-powernv/files/patch-configure
index 5fac68a9cc9f..0099085a85de 100644
--- a/emulators/qemu-powernv/files/patch-configure
+++ b/emulators/qemu-powernv/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2019-12-12 02:59:10 UTC
+--- configure.orig 2018-12-25 04:28:30 UTC
+++ configure
-@@ -3261,10 +3261,10 @@ fi
+@@ -3387,10 +3387,10 @@ fi
# curses probe
if test "$curses" != "no" ; then
if test "$mingw32" = "yes" ; then
@@ -13,7 +13,7 @@
curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
fi
curses_found=no
-@@ -3381,7 +3381,7 @@ for i in $glib_modules; do
+@@ -3501,7 +3501,7 @@ for i in $glib_modules; do
glib_libs=$($pkg_config --libs $i)
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
LIBS="$glib_libs $LIBS"
@@ -22,7 +22,7 @@
else
error_exit "glib-$glib_req_ver $i is required to compile QEMU"
fi
-@@ -5517,27 +5517,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ]
+@@ -5846,27 +5846,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ]
cat > $TMPC <<EOF
int main(void) { return 0; }
EOF
@@ -72,3 +72,12 @@
fi
fi
fi
+@@ -6840,6 +6843,8 @@ elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then
+ QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"
+ elif test "$ARCH" = "ppc64" ; then
+ QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"
++elif test "${ARCH%v?}" = "arm" ; then
++ QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/arm $QEMU_INCLUDES"
+ else
+ QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
+ fi