From nobody Sat Jan 11 14:55:52 2025 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 4YVhRG16W5z5kQCy; Sat, 11 Jan 2025 14:55:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVhRF10LVz4ZDb; Sat, 11 Jan 2025 14:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736607353; 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=GDMRFjG2D9vcJd9ren5j0hnHacyWlRqm5dLK4/NaSA8=; b=X2Bk9UMEsaWfOJnJaVPsgfAg6oxqXkCtntxCromYtgdw+kxKlJMKgRUlVMbhbRX79UakWY 5cHBFaGyMd+QnqDsOX9xtV1PTasi2HxPgWkGTqJ8c7ZYVjGQY9A71/RKcaokZIbNaf/ikn Xix5K1s0l7ZwEMSm6/rjG0fsjybE7eXzf81UxPZdUTvuQt0rUZ3QGdTaAnf+Au9U15ffMU Amfc4Xr/25VfWzOC/YBo6UZSXVPjxPj78MswenO/uCwF3n6H/ZsskRzn13fIZcKbSKNi6z sMRfZSuzum/9vWq33D9GdhXPZY8qHlW3rKdOyVUxyEB1Ugn81rIL0ncSzrEnbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736607353; 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=GDMRFjG2D9vcJd9ren5j0hnHacyWlRqm5dLK4/NaSA8=; b=HaZLbXdW1XYJUbXTfXn4OErd2BbiLg1uEHVDNYh20jULw7TLNPBk7VDzTyE/K+bCpDWwrz pvDWyqOqJJGEVR0EGH5SDD+Mo3VnmekJfukjdPCTerBe3E9BTY++me/H5TGBAwFK2Otpqq 3IqjQycJcmHkK4P4+10vU49yZnir0sP0+eR1LZf3px3TiLPN1xSrj3OFr4EC6atG6FV28n LIqmbUM0Ks4n8Of2PUZu8o0Nig1Xj40Q9Z3JjsyDbF4ZEkokk3JVH1vp3oEskUEDbHw/8k BU29BsZxgFGbSQV/JuGtpetY07PlNRG5a+7zBlSbZdATaXf4stc0OqLxTWz9qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736607353; a=rsa-sha256; cv=none; b=wLEwasNnSxPniV4rZK0J2dg8rA/NbsNJ5DzkJmnAUqN2TuQadIy10crmJEGxNGp1aZtEMI AauLwi6oxab/GllTQchDy9h9k/9LgZ7vwALxLM/8UZVlDoYj0LHFs129Be4jqGoDqfDpzD y8e2fp/47S8QlX1Eh3nQkpKor43PANXbi7K2dgqHSquiyyo4vG0+WI2LDl5j3ZzQHUx24E 2uYP6PFt4FcdvDtMVl8GFn0I9aJmYKmedLwTODXoqwfSle3h/OuKc+BO/aP5DMqoGrXCCo 1DFsQHsz87vuFihRO++2QT/q6KJQDqXeiNMsTP5ImQSPpynytPsfxX6niUdb1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YVhRF0VNBz12fb; Sat, 11 Jan 2025 14:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50BEtqnV036496; Sat, 11 Jan 2025 14:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50BEtqHi036493; Sat, 11 Jan 2025 14:55:52 GMT (envelope-from git) Date: Sat, 11 Jan 2025 14:55:52 GMT Message-Id: <202501111455.50BEtqHi036493@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: ba7961f45432 - main - emulators/qemu: Fix build on i386 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org 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: ba7961f454325f729d11785e2f4a12ddff5b0f33 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba7961f454325f729d11785e2f4a12ddff5b0f33 commit ba7961f454325f729d11785e2f4a12ddff5b0f33 Author: Muhammad Moinur Rahman AuthorDate: 2025-01-11 14:25:26 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-01-11 14:55:29 +0000 emulators/qemu: Fix build on i386 - qemu@tools and qemu@guestagent were failing on i386 due to some headers not being installed on i386 which is fixed. - qemu@tools support compression with zstd which was disabled. Enabled it to support compression of release artifacts. [1] Reported by: dch [1] --- emulators/qemu/Makefile | 17 ++++++++++++++--- emulators/qemu/pkg-plist-ga | 2 +- emulators/qemu/pkg-plist-tools | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 43b450e9a361..d378d3ddb44a 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,5 +1,6 @@ PORTNAME= qemu DISTVERSION= 9.2.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -16,11 +17,13 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le .endif BUILD_DEPENDS= bash:shells/bash +.if ${FLAVOR:U} != guestagent +LIB_DEPENDS+= libzstd.so:archivers/zstd +.endif .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent LIB_DEPENDS+= libfdt.so:sysutils/dtc \ libinotify.so:devel/libinotify \ - libslirp.so:net/libslirp \ - libzstd.so:archivers/zstd + libslirp.so:net/libslirp .endif .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent) LIB_DEPENDS+= libepoxy.so:graphics/libepoxy @@ -114,7 +117,7 @@ CONFIGURE_ARGS+= --disable-attr \ --disable-vnc .endif .if ${FLAVOR:U} == tools -CONFIGURE_ARGS+= --enable-tools +CONFIGURE_ARGS+= --enable-tools --enable-zstd .endif CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} @@ -216,6 +219,14 @@ X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softm .include +.if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent +.if ${ARCH} == "i386" +PLIST_SUB+= NO_I386="@comment " +.else +PLIST_SUB+= NO_I386="" +.endif +.endif + .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \ (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") .if ${ARCH} == "amd64" diff --git a/emulators/qemu/pkg-plist-ga b/emulators/qemu/pkg-plist-ga index 7d934bfea859..76fa57967f1f 100644 --- a/emulators/qemu/pkg-plist-ga +++ b/emulators/qemu/pkg-plist-ga @@ -1,5 +1,5 @@ bin/qemu-ga -include/qemu-plugin.h +%%NO_I386%%include/qemu-plugin.h %%PORTDOCS%%share/man/man1/qemu.1.gz %%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz %%PORTDOCS%%share/man/man7/qemu-cpu-models.7.gz diff --git a/emulators/qemu/pkg-plist-tools b/emulators/qemu/pkg-plist-tools index 0be0420db843..2d227cf2fa0b 100644 --- a/emulators/qemu/pkg-plist-tools +++ b/emulators/qemu/pkg-plist-tools @@ -3,7 +3,7 @@ bin/qemu-img bin/qemu-io bin/qemu-nbd bin/qemu-storage-daemon -include/qemu-plugin.h +%%NO_I386%%include/qemu-plugin.h %%PORTDOCS%%share/man/man1/qemu.1.gz %%PORTDOCS%%share/man/man1/qemu-img.1.gz %%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz