From nobody Sat Jan 14 06:59:42 2023 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 4Nv8Kp3V1sz2pCx1; Sat, 14 Jan 2023 06:59:42 +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 4Nv8Kp32Nfz3wCg; Sat, 14 Jan 2023 06:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673679582; 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=sm3WNkpbSdnliSrvCPb+ui+MxaeeGV/1g4QMmohCLoA=; b=kVCwsiIZpLwMYYE2TAznqR45ACdFPSmeJJ6vZjDqmsgFex2z1Zq838Gy73EIQIcHrB9NoH DBtcK6MxDcebh5BFHZ1c6WFKy0fU5+pFdQueL3aB6wkkfykPTpBZgI0KUEXDMK0IgKvH3u jZSBFrpf76Mu0y+uWJhuYLNOshmX9j9f7CKdyf+YhKb+pU43JMm4GZKaGin54LsdI0I1SW PCeFkfKWAaMrytM6+/tSiUN9LYkSkyZmGh/BERY1iBMipGkMy0d2Wb0XYa6G9p1PRhTPp9 Yt5tA2cfWvCEQGCOmu7S9alHzlphoibojcGw1Jhx6smaCDVmYM0MnA5MaiB4Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673679582; 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=sm3WNkpbSdnliSrvCPb+ui+MxaeeGV/1g4QMmohCLoA=; b=UMA1Zzf/4B9PUE01aHcYnT0ZA/HTB3jgUjeM3ro2K2DbZLWUOrJDJYPxO1E0yNXdgUto6z 9Wi+T+8cd9orKVxVkP2T6xJmyKKhG4d39hGma+u88IzJUF64ImvYdNBfoSMHlURTnYJz4H Kq4AaQJ0mvyhCNXJPYWG3NCDQ7/TOeY+pAGE7BjMlTW/r6Oh70nzfBrclhwEd9l3CATXN9 rhNM5iCoW8RyUH3mnTicPAPpEdWG14TsTII2jCvcZsFy8sCJMQn3yfH0Tu7XVx9ejy6sFN SmnxyJiCb/R5DS6BShp7bj5YiSAFdH+Ln6XHL/JKytzfjRGMC9Sf8VuihIQkXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673679582; a=rsa-sha256; cv=none; b=KSTMbV4MPA8VO06PdYn0dgl8fwCumvO9ZCPykdw9sOUWU+sBBl+s3RcsmocbVPhcyxBBcQ xqhHOXiwzYapNF/zH9eLHBBDdLivLybDhaqK6s4EzNnMLDNrvaUL8kyW/n0HIKgLoqgRFw rt3wiL34bm5ltpO8n+uC9qYpdhwi1tjBUwQzu4IpyJ5hEf+Idxq7WfiM/jNuu1vzu3+c7R EBuuaywV2QU74DesyvUDPiK5YI7pBsfuGxaEV3uKSJKhFN5ENY2YN1WbHYGJVAMjgoVTdY HtTTnC/ebIJDbq17azh4Rxz8YU1U8p1qjc2KGzqSm4+tj20sbDUsK0/hvHXahg== 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 4Nv8Kp27RXzdHZ; Sat, 14 Jan 2023 06:59:42 +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 30E6xgbb057200; Sat, 14 Jan 2023 06:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30E6xg17057199; Sat, 14 Jan 2023 06:59:42 GMT (envelope-from git) Date: Sat, 14 Jan 2023 06:59:42 GMT Message-Id: <202301140659.30E6xg17057199@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: 5fcabb512923 - main - emulators/qemu: Re-enable build 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: 5fcabb512923df12ff55d9e9d378e2ad774f4ecd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5fcabb512923df12ff55d9e9d378e2ad774f4ecd commit 5fcabb512923df12ff55d9e9d378e2ad774f4ecd Author: Muhammad Moinur Rahman AuthorDate: 2023-01-14 06:57:26 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-01-14 06:59:31 +0000 emulators/qemu: Re-enable build for i386 During the upgrade to 7.0 the build of qemu for i386 got disabled, due to "unknown-type name 'vm_page_t'" errors. This has been fixed. PR: 268647 Reported by: dim --- emulators/qemu/Makefile | 2 +- emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h | 6 +++--- emulators/qemu/files/patch-meson.build | 4 ++-- emulators/qemu/files/patch-util_meson.build | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index ca35689d0ee8..be243a683990 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -11,7 +11,7 @@ WWW= https://www.qemu.org/ LICENSE= GPLv2 .if ${FLAVOR:U} != tools -ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le # We need to check if it build with other ARCHS # For i386 we have unknown type name 'vm_page_t' .endif diff --git a/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h index 524ffb667f50..07d731fd4f54 100644 --- a/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h +++ b/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h @@ -1,10 +1,10 @@ --- bsd-user/host/i386/host-signal.h.orig 2022-12-14 16:28:45 UTC +++ bsd-user/host/i386/host-signal.h -@@ -13,6 +13,7 @@ +@@ -12,6 +12,7 @@ + #include #include #include - #include +#include + #include #include - static inline uintptr_t host_signal_pc(ucontext_t *uc) diff --git a/emulators/qemu/files/patch-meson.build b/emulators/qemu/files/patch-meson.build index e701a096e957..1ada4462a416 100644 --- a/emulators/qemu/files/patch-meson.build +++ b/emulators/qemu/files/patch-meson.build @@ -1,6 +1,6 @@ ---- meson.build.orig 2022-04-19 19:10:27 UTC +--- meson.build.orig 2022-12-14 16:28:45 UTC +++ meson.build -@@ -2505,14 +2505,10 @@ if have_system +@@ -2719,14 +2719,10 @@ if have_system fdt_opt = get_option('fdt') if fdt_opt in ['enabled', 'auto', 'system'] have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt') diff --git a/emulators/qemu/files/patch-util_meson.build b/emulators/qemu/files/patch-util_meson.build index 590b1f5a0592..135b2ee3f156 100644 --- a/emulators/qemu/files/patch-util_meson.build +++ b/emulators/qemu/files/patch-util_meson.build @@ -1,6 +1,6 @@ ---- util/meson.build.orig 2022-04-23 11:59:28 UTC +--- util/meson.build.orig 2022-12-14 16:28:45 UTC +++ util/meson.build -@@ -87,10 +87,6 @@ if have_block +@@ -97,10 +97,6 @@ if have_block util_ss.add(files('readline.c')) util_ss.add(files('throttle.c')) util_ss.add(files('timed-average.c'))