From nobody Sun Dec 18 17:43:44 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 4NZqvN4K6mz1GlvW; Sun, 18 Dec 2022 17:43:44 +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 4NZqvN3vV5z4HyQ; Sun, 18 Dec 2022 17:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385424; 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=fzPABY1gppvXzrWU98kIutjyLxKao79grm1+wbtEIu0=; b=ZyiVk09MAmn7XTUQ78LuNBExPwuucXxpcAJNV3ZOpvjwURxb76BYE5NIXk2TJE3I0xHC9C 0fP6SYukRtjvYd/IpiJlbeE3DbOhbWH8NrgCEUk60hK5YfjK+uIVIDMwxDQgRfQExYfj74 aT49QSnMlZvt4np5gHuUWPpBRvk/Q9CnqWPWhJ6l1dan3doQ9T5aQG6URJ7lYYnfyLlyai 8xquFeIpCsgv+NyhJxFsNv2ESaDZpojDoIjWFfTMSvzUaL4nEvtZ0GFmQMbjjtm+knDjaO uE9bks20AvcPbwNF5hQPvK8CXrbtY1ADZ1jyiSIO0LM20Wu+O+T6DwAZW37m0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385424; 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=fzPABY1gppvXzrWU98kIutjyLxKao79grm1+wbtEIu0=; b=X2jHJb+lzmLITMjEK+p8x89FTpfzHRgPeCeL9h5FPf3T8QGOY7CB822dFik37dsE4UxiAb q4YHGxHGFCXHulAsJuKwhr1xH6ceMys4KG2WTji0eEenL+eNCkIl4dd+wjdZHG5mpO0Tvy xZ0unzIcogrnZT7YAVnu91Me8BxGN03UyAFn5LGLilyhQnyklXuQbZP+JjvmdaVSej1e17 2lE326UORllowtqN7GGFW9+WaDBD00skgV9W2WaBWWeYk7kEwXPMkpkpp+jFKamj80GVgo QsP2I9XQ7U+7KPJxvtUmo5UD3lMNOQzHuyVve5/lR7E+Thv88Un9KVW8sYZ9fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385424; a=rsa-sha256; cv=none; b=QVHsvn5p8XPaCIzKbAjuv6nmvdNXSSfDeQVipshRzUgoYAofZaPRu6Gt4sLKpKTizs/fQc 3DODnySt42cWv1vRQ05vcSXH+L0jkCYYnIVVgyrRQ0YCvinQdL2KgrMuKYOR5kTYZh6uTI G4XZjRHppJ46SFfhcfTEpMyQPiAdLv8pNYL6JpPtKsCA2EX+SNdIqlX/0xDOhFgI7xcCq9 hVNvjH9PF+UMbXZEBBw9gIli/P7+idiua5Q7dZnVwxt3VQls45gzlNEtH4t0HVdiFAV6xF Hf9Kkj3vXipt20Hx9kAdoKp09yPb+1YKQd9YcM6Sm03yS/yZ+iyggKKE+LLwlQ== 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 4NZqvN2jVPzPsc; Sun, 18 Dec 2022 17:43:44 +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 2BIHhiRE006311; Sun, 18 Dec 2022 17:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhiHf006310; Sun, 18 Dec 2022 17:43:44 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:44 GMT Message-Id: <202212181743.2BIHhiHf006310@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 4131f9bfd8d3 - main - sysutils/py-psutil: fix build with clang 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4131f9bfd8d3adb98d096856ee08d2ac7756d7cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=4131f9bfd8d3adb98d096856ee08d2ac7756d7cd commit 4131f9bfd8d3adb98d096856ee08d2ac7756d7cd Author: Dimitry Andric AuthorDate: 2022-12-07 15:06:16 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:26:43 +0000 sysutils/py-psutil: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that sysutils/py-psutil failed to build with clang 15: psutil/arch/freebsd/sys_socks.c:70:25: warning: comparison between pointer and integer ('kvaddr_t' (aka 'unsigned long long') and 'void *') [-Wpointer-integer-compare] if (xf->xf_data == sock) ~~~~~~~~~~~ ^ ~~~~ psutil/arch/freebsd/sys_socks.c:182:40: error: incompatible integer to pointer conversion passing 'kvaddr_t' (aka 'unsigned long long') to parameter of type 'void *' [-Wint-conversion] xf = psutil_get_file_from_sock(so->xso_so); ^~~~~~~~~~ psutil/arch/freebsd/sys_socks.c:65:33: note: passing argument to parameter 'sock' here psutil_get_file_from_sock(void *sock) { ^ psutil/arch/freebsd/sys_socks.c:303:40: error: incompatible integer to pointer conversion passing 'kvaddr_t' (aka 'unsigned long long') to parameter of type 'void *' [-Wint-conversion] xf = psutil_get_file_from_sock(xup->xu_socket.xso_so); ^~~~~~~~~~~~~~~~~~~~~ psutil/arch/freebsd/sys_socks.c:65:33: note: passing argument to parameter 'sock' here psutil_get_file_from_sock(void *sock) { ^ 1 warning and 2 errors generated. This can be fixed by adjusting the psutil_get_file_from_sock() function to take a kvaddr_t instead of a void pointer. PR: 268233 Approved by: portmgr (tcberner) MFH: 2022Q4 --- .../py-psutil/files/patch-psutil_arch_freebsd_sys__socks.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sysutils/py-psutil/files/patch-psutil_arch_freebsd_sys__socks.c b/sysutils/py-psutil/files/patch-psutil_arch_freebsd_sys__socks.c new file mode 100644 index 000000000000..04a9c7b6623c --- /dev/null +++ b/sysutils/py-psutil/files/patch-psutil_arch_freebsd_sys__socks.c @@ -0,0 +1,11 @@ +--- psutil/arch/freebsd/sys_socks.c.orig 2022-09-02 10:06:38 UTC ++++ psutil/arch/freebsd/sys_socks.c +@@ -62,7 +62,7 @@ struct xfile * + + + struct xfile * +-psutil_get_file_from_sock(void *sock) { ++psutil_get_file_from_sock(kvaddr_t sock) { + struct xfile *xf; + int n; +