From nobody Sun Dec 12 23:38:51 2021 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 D30A518EB19C; Sun, 12 Dec 2021 23:38:51 +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 4JC1LM4Fr7z3KGm; Sun, 12 Dec 2021 23:38:51 +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 728D620AA; Sun, 12 Dec 2021 23:38:51 +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 1BCNcpoX093518; Sun, 12 Dec 2021 23:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCNcp6x093517; Sun, 12 Dec 2021 23:38:51 GMT (envelope-from git) Date: Sun, 12 Dec 2021 23:38:51 GMT Message-Id: <202112122338.1BCNcp6x093517@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: f52ce2807b99 - main - emulators/qemu: UNBREAK for 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: 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f52ce2807b99550bdd187a4f6dc96ca5882f2f44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639352331; 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=zZyXJ8Z2vnrM60D7XZA7D5YkkxuwgAJJCILGMm682Kc=; b=kIIy1V/yBG76mw1/oHl0rWPEiiJL2C6Tb7wTtRdj42WKu7fkuWiGhyIyYo+dpAbbry1sha nT7SUivL10uiyEs92CExCIVQvsFj6LJ/HbWmnYJXEVZd6TDbikmvmRB8NcTGrnuZzBw48p 0fXEvhBqOEAJ8jncDCUgPVTxKEMk+ld3+140VV0jl91qL3lsXHMco/TjSpq8iJkExY63A/ y8w+b4is6HHvIrfsqj4bPQiMN5VpqR9mNZcwWgqKb34cMsgb7PncdD03i6k0nSmQzPW+QD IPGsSbvy9lsXvaa5n2B5Dzw9kWp0oowsjYG7a9wgYevOX7vGR7Y52T1P+ojkwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639352331; a=rsa-sha256; cv=none; b=xXaor3EEZUSO8dcOSy1QERSNyYhX8mK0DgoIgwiXWGHresLSzyeEKasOuSJ0na8xmntr5a NfzO0QmJyGgPZxJKgcxqAJYCJuKHDbWRMsIIu4rmUHNfwZHdVkLpi35bfjU/KHxZ/VCpI1 PpMcMFWYW438cefYPIr3vVtzh3r1sk+5iu5+72X8YkoOqNP6HhidEffcGs8kFCeko5uBqx +6yKtgp7i7eE8wY1RGp4psecHkXx5vW059hz6mgvL6xPhxSJWCeerjKVqTM9o3EQGNWhz/ 7XvcVSnnHyTDpKNstUui5PaMNcm9eYKaJJp6SjuIEnb8OzA5itj+B7vLT9cJvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f52ce2807b99550bdd187a4f6dc96ca5882f2f44 commit f52ce2807b99550bdd187a4f6dc96ca5882f2f44 Author: Muhammad Moinur Rahman AuthorDate: 2021-12-12 23:37:45 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-12-12 23:38:43 +0000 emulators/qemu: UNBREAK for i386 - Fix some plist issues with default flavor --- emulators/qemu/Makefile | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 9abea5cf1def..efa262c09906 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -14,14 +14,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash .if ${FLAVOR:U} != tools -LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ - libfdt.so:sysutils/dtc \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libnettle.so:security/nettle \ - libpcre2-8.so:devel/pcre2 \ +LIB_DEPENDS+= libfdt.so:sysutils/dtc \ libzstd.so:archivers/zstd .endif +.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +LIB_DEPENDS+= libepoxy.so:graphics/libepoxy +.endif FLAVORS= default nox11 tools FLAVOR?= ${FLAVORS:[1]} @@ -38,12 +36,12 @@ tools_PLIST= ${.CURDIR}/pkg-plist-tools USES= cpe gmake gnome ninja perl5 pkgconfig python:build tar:xz USE_GNOME= glib20 USE_PERL5= build -.if (empty(FLAVOR) || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") -ONLY_FOR_ARCHS= amd64 powerpc powerpc64 powerpc64 powerpc64le -USES+= bison compiler:c11 iconv:wchar_t xorg -USE_GNOME= cairo libxml2 -USE_PYTHON= distutils noflavors -USE_XORG= pixman +.if ${FLAVOR:U} != tools +ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64 powerpc64le +USES+= iconv:wchar_t +.endif +.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +USE_GNOME+= cairo .endif HAS_CONFIGURE= yes @@ -121,7 +119,7 @@ VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 X11_CONFIGURE_ENABLE= sdl X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl -.if (empty(FLAVOR) || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") +.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' @@ -144,12 +142,10 @@ CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L/usr/lib \ CONFIGURE_ARGS+=--enable-netmap --enable-fdt=system .endif .if ${FLAVOR:U} == tools -CONFIGURE_ARGS+=--disable-netmap --disable-system \ - --disable-user --disable-guest-agent \ - --disable-nettle --disable-gcrypt \ - --disable-curses --disable-vnc \ - --disable-virtfs --disable-brlapi \ - --disable-fdt --disable-rdma \ +CONFIGURE_ARGS+=--disable-netmap --disable-system --disable-user \ + --disable-nettle --disable-gcrypt --disable-curses \ + --disable-vnc --disable-virtfs --disable-brlapi \ + --disable-fdt --disable-rdma --disable-guest-agent \ --disable-cap-ng --disable-attr \ --disable-vhost-net --disable-spice \ --disable-rbd --disable-libnfs \ @@ -163,7 +159,7 @@ CONFIGURE_ARGS+=--disable-netmap --disable-system \ .include -.if (empty(FLAVOR) || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") +.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif