From nobody Fri Jun 30 07:19:27 2023 X-Original-To: dev-commits-ports-main@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 4QsmsX0KT2z4kpnf; Fri, 30 Jun 2023 07:19:28 +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 4QsmsW2Sxnz3pYW; Fri, 30 Jun 2023 07:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109567; 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=30WZ4dG5jJYFRjwsqP058ysEjEFMOMzIln889970Dxc=; b=a/SgBTUL77AujxxBGQPlnPEjpRzYy5Z94j0C9+bXeg9gQ1j3ZrcBuqLMUNyiySX+VshIjx tySDfclCggjw0TOg17r/MIln6rmdYC4BmgTTtg0uL4n44WqZLYBAEPSoNEIGWIQFW7hRc/ GuFH8bTrhj7bHYm9jYxBIHVyv5Jmwloa5QOPORtKsXcnZYIung2uAsZ7ThTSe+t01rUMdt 5aEkNkfozGxhxte4XFiUVK2TRLmV3sI5aGJ9VgMois7h9kQ8FIht8WidwQFGm1hVayL3V8 wOAvGj32Lbfj1kfkibbA0GFHPrUBF6fRbbUgqz0WIaM1F/fi3DJyWl0g2CGkkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109567; 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=30WZ4dG5jJYFRjwsqP058ysEjEFMOMzIln889970Dxc=; b=EuJht1GRa33KbknqjAGflOmE1bosTdjQi3EUP3aZxY4SVyZLn+b5cjwp+dy34N2VzwtCfA bpyl4JPNjF2ByJDafLwjP3eTgzs8HWdhdQI4FEYyYF54MazzLUk9q3co2EnCgBdZps2sCY 1K6gVae+bS506xj7Ty0h2qYthXVq/YtXmKnAPjMA16qJbYQYKQ+4+P2ZuGnkx4dCYC+nu9 69fg1KuYVSPrjyhGPju+CbCwQh/Auqnwg51JfLzEdq/EX89O9iiJQ+2Lw28rSkOMfWTQ7D I6AQkaTqdKaCRmmxuRRad9EeG2FU1dP2JwbhMwCs8RsUjPtNJPqpQMVRX4gfPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109567; a=rsa-sha256; cv=none; b=obHEzMB66c52cR/tFadCVixr+zwf4g5Tin/cObCYPUfPPLqAHrgBET/cBTsLSyrJSTwObP FvU+o6fuinmgUIe0b42iUtgzkLnv6JYHaSctYAbDV15ZSM+NcHJv41oWmPeCyhzqXaH/1b C8eQCGazuO5Dz7+566tRGXJEsTXDuvJ1otdTuy3Hqj8Zjmpmx4g+tQrkXuv8Q7bzQ5d+Jx nlwRVHcXBi3a7Zwv+gStAjpQpvvGS6h8RQY2eeNgc9AVaoEU/TBbcZMtn2RlY9yxiyaLMB oCBwTBhS2PbVT9bG/sQ3v8Jpafw6XkTAnrC40lV1B5vkyK4mFVhnT/UPJztPeA== 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 4QsmsW1YXwzqC7; Fri, 30 Jun 2023 07:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7JRBW066180; Fri, 30 Jun 2023 07:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7JRwd066179; Fri, 30 Jun 2023 07:19:27 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:19:27 GMT Message-Id: <202306300719.35U7JRwd066179@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1397fea20826 - main - devel/py-ddtrace: Fix build with Clang 15 and remove the workaround List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1397fea2082658965bb3255f1c0a2d621b00ab2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1397fea2082658965bb3255f1c0a2d621b00ab2b commit 1397fea2082658965bb3255f1c0a2d621b00ab2b Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:03:25 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:03:25 +0000 devel/py-ddtrace: Fix build with Clang 15 and remove the workaround ddtrace/vendor/psutil/arch/freebsd/sys_socks.c:178:40: error: incompatible integer to pointer conversion passing 'kvaddr_t' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] xf = psutil_get_file_from_sock(so->xso_so); ^~~~~~~~~~ ddtrace/vendor/psutil/arch/freebsd/sys_socks.c:61:33: note: passing argument to parameter 'sock' here psutil_get_file_from_sock(void *sock) { ^ ddtrace/vendor/psutil/arch/freebsd/sys_socks.c:298:40: error: incompatible integer to pointer conversion passing 'kvaddr_t' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] xf = psutil_get_file_from_sock(xup->xu_socket.xso_so); ^~~~~~~~~~~~~~~~~~~~~ ddtrace/vendor/psutil/arch/freebsd/sys_socks.c:61:33: note: passing argument to parameter 'sock' here psutil_get_file_from_sock(void *sock) { ^ 1 warning and 2 errors generated. --- devel/py-ddtrace/Makefile | 6 ------ devel/py-ddtrace/files/patch-clang15 | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile index d154255a634e..55c9303a1d3d 100644 --- a/devel/py-ddtrace/Makefile +++ b/devel/py-ddtrace/Makefile @@ -38,12 +38,6 @@ OPENTRACING_DESC= OpenTracing support OPENTRACING_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}opentracing>=2.0.0:devel/py-opentracing@${PY_FLAVOR} -.include - -.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000) || ${OSVERSION} >= 1400079) -CFLAGS+= -Wno-error=int-conversion -.endif - post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/devel/py-ddtrace/files/patch-clang15 b/devel/py-ddtrace/files/patch-clang15 new file mode 100644 index 000000000000..e65d3f2c72a8 --- /dev/null +++ b/devel/py-ddtrace/files/patch-clang15 @@ -0,0 +1,20 @@ +--- ddtrace/vendor/psutil/arch/freebsd/sys_socks.c.orig 2023-06-01 14:26:07 UTC ++++ ddtrace/vendor/psutil/arch/freebsd/sys_socks.c +@@ -175,7 +175,7 @@ int psutil_gather_inet(int proto, PyObject *py_retlist + + char lip[200], rip[200]; + +- xf = psutil_get_file_from_sock(so->xso_so); ++ xf = psutil_get_file_from_sock((void *) so->xso_so); + if (xf == NULL) + continue; + lport = ntohs(inp->inp_lport); +@@ -295,7 +295,7 @@ int psutil_gather_unix(int proto, PyObject *py_retlist + if (xup->xu_len != sizeof *xup) + goto error; + +- xf = psutil_get_file_from_sock(xup->xu_socket.xso_so); ++ xf = psutil_get_file_from_sock((void *) xup->xu_socket.xso_so); + if (xf == NULL) + continue; +