From nobody Mon Aug 29 13:21:56 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 4MGWLX3L9Rz4b7x5; Mon, 29 Aug 2022 13:21:56 +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 4MGWLX2sybz4Dt8; Mon, 29 Aug 2022 13:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661779316; 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=oXaKqHw+VFpWMhF7q29yG0zllSo2jSt/LwHKxBEJEUY=; b=fYNBK/Z/nEiW5aF0uirYikG6pQ1uLSZ8Y1tRzA05drXOEQh6bZLOA/YfB1qsbjJ7+hIa8E Vk/lp26QSVuYodsaoN7rddpQuN3ggUKEhBg5d+Lnk2TrjiXIAv3o7QoI4d2083laa0wYBr hrSsJLqKtdjH8DG8o63BNN8E8+lEy3p6sL1ti/Vb7OmffVi4SVMtvMtfDvcO6fni+K66/w g7gzjV7YzZbwBdJeDqGLNEYxqjad1lPwZVMLk/YPy8qvHL76uu/hWCaqkwN19zQwHDh8us 8Vpz/BbkOgo7Fi/chwOtG5FXhFerdtok+lnF5dy7jkPY6GdQ/zj9LMm0+bb9qQ== 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 4MGWLX1zJXzRWc; Mon, 29 Aug 2022 13:21:56 +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 27TDLuZk037709; Mon, 29 Aug 2022 13:21:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27TDLuwq037708; Mon, 29 Aug 2022 13:21:56 GMT (envelope-from git) Date: Mon, 29 Aug 2022 13:21:56 GMT Message-Id: <202208291321.27TDLuwq037708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 1c7b941ef353 - main - emulators/qemu-devel: fix build on powerpc64* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c7b941ef353bc9b96e86c00a60e4327cb8af606 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661779316; 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=oXaKqHw+VFpWMhF7q29yG0zllSo2jSt/LwHKxBEJEUY=; b=EtO//qIJ+UZjXJk2/D6rQGxlytV0po0nUm59V9iOHDG/LyY4Up8j7AiQ78phUv0DLQkOAr PCy9am0Y6QfpgJ8MDcYDaBqTpV8aaOvgDzr5asNlRzh4Fn218fI0Ei7OtWYIRaCDJqkStL pgm5Z/fRkh5OFZqcKxBNxeuHvjVT4FXdN58iH+ofjQIHyD1L8jhhBVYMc4eh65BCJUOheh DGvrSKvPxg9kig12E6+tBB91+UpljRWHEo6sXwZRBZazpmRjgFS8c2IL+COTXzajTOzgYx cg+IJIUoKWxgN/yWUc0BPFy/TAovntvabx5JqfasJ0iX+t/teOxtZAbygOFe7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661779316; a=rsa-sha256; cv=none; b=oqSkgm612qZjBs16kH+WNcsgft10yHDpJnTNq02Hc/RiX1PneFuru3k3nZZtkv3KqeUYy/ yLo+8w+IfzjtvUMhnlbtxxlWGw2WwaBDTz8CszA1hjygs728O2ntPaGWVpdp3jt99lZH1w HPJktcs8uCTX6jdVjlvG5zKvZiKlfIN5bjVHnkOxVak6wTH8bwqT4UkSpqSm65V3ml8zOk 51EmbTPPfT9ob72UTkpXsDb0lkq+yYsPRBY7mbLPxbzRYvXyv0PUpaeBYYAVl5IWLBC3O5 A/XKIlgT075zUPrvv+Qh+w3A7Iw98X6UouoEeM+PuhSy33HDAFS4IFNYlxhd7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c7b941ef353bc9b96e86c00a60e4327cb8af606 commit 1c7b941ef353bc9b96e86c00a60e4327cb8af606 Author: Piotr Kubaj AuthorDate: 2022-08-29 05:36:26 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-29 13:19:48 +0000 emulators/qemu-devel: fix build on powerpc64* This forward ports 0d01a77b1ff0377c47919c3982d161e7546d34f. --- emulators/qemu-devel/Makefile | 6 +++++- emulators/qemu-devel/pkg-plist | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 654f5dfcdfff..39012384bcc6 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -130,8 +130,12 @@ MAKE_ARGS+= ARCH=ppc USE_GCC= yes .endif -.if ${ARCH} == "powerpc64" +.if ${ARCH:Mpowerpc64*} +CONFIGURE_ARGS+= --disable-bsd-user MAKE_ARGS+= ARCH=ppc64 +PLIST_SUB+= BSDUSER="@comment " +.else +PLIST_SUB+= BSDUSER="" .endif .if ${ARCH} == "sparc64" diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist index 8a0e597b2ec1..2fdbbe61ff5a 100644 --- a/emulators/qemu-devel/pkg-plist +++ b/emulators/qemu-devel/pkg-plist @@ -1,7 +1,7 @@ bin/elf2dmp -bin/qemu-arm +%%BSDUSER%%bin/qemu-arm bin/qemu-edid -bin/qemu-i386 +%%BSDUSER%%bin/qemu-i386 bin/qemu-img bin/qemu-io %%GTK3%%bin/qemu-keymap @@ -35,10 +35,10 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-sparc %%NO_X86_TARGETS%%bin/qemu-system-sparc64 %%NO_X86_TARGETS%%bin/qemu-system-tricore -bin/qemu-system-x86_64 +%%BSDUSER%%bin/qemu-system-x86_64 %%NO_X86_TARGETS%%bin/qemu-system-xtensa %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb -bin/qemu-x86_64 +%%BSDUSER%%bin/qemu-x86_64 include/qemu-plugin.h man/man1/qemu.1.gz man/man1/qemu-img.1.gz