From nobody Wed Apr 27 13:40:05 2022 X-Original-To: dev-commits-ports-all@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 A3B961AB7F10; Wed, 27 Apr 2022 13:40:06 +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 4KpKck2YKNz4rZ0; Wed, 27 Apr 2022 13:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651066806; 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=3IdOChQ7lQG8cot5mNN7GL4pcoJLEKRwoNNJUuFCBKU=; b=MvVbEpCd+2XbHGeT7K1wEi1LmIa7IjZ95I2YQlQMgI8obathj70EAh1rRmWNbPv4OEY0ES Yq/WxlLqAtZXL352UzuMXuhifbigu1JiIPTW8IkC2Mu3Kw0+YqJIlw8YCj7QlyZwq3kBO8 M7aAtAJ95yFNo1rrPoELNHaW22FK4KShz1tSVcOy3cKCxeoAVZ4iD3iejnu8lMPLuj74Fm a3g8sR+O/2hubMInPUedWeXRVRjJRwaoUINSrR49ACMJZh3+XevdsadZDWC9q/kS/vdD9u PkMrsr1Q13awpl6S2suKWZ5pJyUc346tg7nvvDIkeGM51kUyoDie4cGGcTxYGg== 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 5F03E24CAF; Wed, 27 Apr 2022 13:40:05 +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 23RDe57O073745; Wed, 27 Apr 2022 13:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RDe5Oi073743; Wed, 27 Apr 2022 13:40:05 GMT (envelope-from git) Date: Wed, 27 Apr 2022 13:40:05 GMT Message-Id: <202204271340.23RDe5Oi073743@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: 30d01a77b1ff - main - emulators/qemu: fix build on powerpc64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 30d01a77b1ff0377c47919c3982d161e7546d34f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651066806; 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=3IdOChQ7lQG8cot5mNN7GL4pcoJLEKRwoNNJUuFCBKU=; b=ejLTqaJFgxrRo2SC0nR7cwoBsqABVBHttF0cF+nXgF/p/LBEQk+jiEHrv2iKh83JBF81uW zGmO/4Twn8Ai9QlMjnPXO4jwdt2DCTJj8OtLPnmOF8A1SfrZlPM6/sIOSJEVCWN+ShOHNB kUG87Zy2UqJH38sRg/KgSgGISGBk+DYrQI7Js8kHg49DX4lHkEp7JLbeJp0aav8twevgF+ 1WIcAepUbCujGjAmOiraxJGKDRTsTd59q5KBC7Sv2h2kEr08CGqrsBD7RcaNZh5UlPsy1w 9gg0HDYoY1BpgYzO4xHTXVIEwx3f6BsmFIWhS5lfmzc0pF782v2hDgrlPTmMSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651066806; a=rsa-sha256; cv=none; b=LFDe39BdwHLmcgS8naHPrC+QAcXDY8NAx1Yc8uTHj6aiKqHf5NbyR3L4TNDiwAOc0mwl36 UZmf7ZFPZiU2DdNwiaPZlsiSbRDsuIyVO7Q3NKR6I9CMrBsJ/4jN7rGJuEmlkR8kmU4wHx 6m3OXyaNXn0/lR3STxDrSJ3iCevcgs9SAAK+yzFBc53c0wDs9Iyx7X1tN9gY/sO1eNX8DQ uZSwQSlcRD0RHVXXzmMUYbVV6WPe81XI5EnwD4WvBVIhGizQOrhV2j+yMSoiHs9drXpRyN Iue/nv03nnIm0Oy1PwJmndkfaK28+2AAw2s4y+au5DR0Npdxd+fKjxL39/7MhA== 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=30d01a77b1ff0377c47919c3982d161e7546d34f commit 30d01a77b1ff0377c47919c3982d161e7546d34f Author: Piotr Kubaj AuthorDate: 2022-04-27 13:21:01 +0000 Commit: Piotr Kubaj CommitDate: 2022-04-27 13:21:01 +0000 emulators/qemu: fix build on powerpc64 bsd-user disabled because of no bsd-user/host/ppc64. --- emulators/qemu/Makefile | 8 ++++++-- emulators/qemu/pkg-plist | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 7a009d772d4e..44097753b44d 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -13,10 +13,10 @@ COMMENT= QEMU CPU Emulator ${${FLAVOR}_COMMENT} LICENSE= GPLv2 .if ${FLAVOR:U} != tools -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= amd64 powerpc64 # We need to check if it build with other ARCHS # For i386 we have unknown type name 'vm_page_t' -# ONLY_FOR_ARCHS= powerpc powerpc64 powerpc64 powerpc64le +# ONLY_FOR_ARCHS= powerpc64le .endif BUILD_DEPENDS= bash:shells/bash @@ -211,7 +211,11 @@ USE_GCC= yes .endif .if ${ARCH} == "powerpc64" +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/pkg-plist b/emulators/qemu/pkg-plist index c6e08a30d47b..00d0673675ba 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -1,7 +1,7 @@ %%CURL%%bin/elf2dmp -%%NO_X86_TARGETS%%bin/qemu-arm +%%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-arm bin/qemu-edid -bin/qemu-i386 +%%BSDUSER%%bin/qemu-i386 bin/qemu-img bin/qemu-io %%GTK3%%bin/qemu-keymap @@ -37,7 +37,7 @@ bin/qemu-system-i386 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 %%PORTDOCS%%man/man1/qemu.1.gz %%PORTDOCS%%man/man1/qemu-img.1.gz