From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 19:46:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DF7E5E61E9; Tue, 20 Apr 2021 19:46:21 +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 4FPvM06yHQz3QTP; Tue, 20 Apr 2021 19:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D35D018E69; Tue, 20 Apr 2021 19:46:20 +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 13KJkK30051389; Tue, 20 Apr 2021 19:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KJkK34051388; Tue, 20 Apr 2021 19:46:20 GMT (envelope-from git) Date: Tue, 20 Apr 2021 19:46:20 GMT Message-Id: <202104201946.13KJkK34051388@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9e06cd045480 - main - emulators/qemu: Fix build on 13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e06cd0454806020fc8e2f11df85baf500690902 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 19:46:21 -0000 The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e06cd0454806020fc8e2f11df85baf500690902 commit 9e06cd0454806020fc8e2f11df85baf500690902 Author: Muhammad Moinur Rahman AuthorDate: 2021-04-20 19:41:51 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-04-20 19:46:11 +0000 emulators/qemu: Fix build on 13 - Use ports dtc instead of packaged dtc [1] - bin/elf2dmp apparently depends on CURL [2] - Reduce build to only X86 architectures if X86_TARGETS is set [2] - rx is not an X86 architecture [2] PR: 245997 [1] 254385 [2] Reported by: swills [1] pstef [2] --- emulators/qemu/Makefile | 13 +++++++++++-- emulators/qemu/pkg-plist | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index a3eddfedcd2b..073ceb348b86 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -2,6 +2,7 @@ PORTNAME= qemu PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -19,7 +20,8 @@ LIB_DEPENDS?= libnettle.so:security/nettle \ libfreetype.so:print/freetype2 \ libepoxy.so:graphics/libepoxy \ libpcre2-8.so:devel/pcre2 \ - libzstd.so:archivers/zstd + libzstd.so:archivers/zstd \ + libfdt.so:sysutils/dtc PATCHFILES+= 55765822804f.patch:-p1 PATCHFILES+= aa4d30f6618d.patch:-p1 @@ -112,6 +114,7 @@ X11_USES= sdl X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg INSTALLS_ICONS= yes +X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' .endif PORTDOCS?= docs index.html interop/.buildinfo interop/* qemu-ga-ref.html qemu-ga-ref.txt \ @@ -122,7 +125,7 @@ WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CFLAGS_amd64+= -fPIC CONFIGURE_ARGS?=--localstatedir=/var \ - --extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh \ + --extra-ldflags=-L${LOCALBASE}/lib --disable-libssh \ --prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --python=${PYTHON_CMD} \ @@ -150,6 +153,12 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 +PLIST_SUB+= IVSHMEM="" +.else +PLIST_SUB+= IVSHMEM="@comment " +.endif + PLIST_SUB+= LINUXBOOT_DMA="" post-patch-CDROM_DMA-off: diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist index c757443833ac..7d411c15d7b8 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -1,4 +1,6 @@ -bin/elf2dmp +%%CURL%%bin/elf2dmp +%%IVSHMEM%%bin/ivshmem-client +%%IVSHMEM%%bin/ivshmem-server bin/qemu-edid bin/qemu-ga bin/qemu-i386 @@ -30,7 +32,7 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-ppc64 %%NO_X86_TARGETS%%bin/qemu-system-riscv32 %%NO_X86_TARGETS%%bin/qemu-system-riscv64 -bin/qemu-system-rx +%%NO_X86_TARGETS%%bin/qemu-system-rx %%NO_X86_TARGETS%%bin/qemu-system-s390x %%NO_X86_TARGETS%%bin/qemu-system-sh4 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb