cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/py-psutil: fix build with clang 15

Browse Source 
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
This commit is contained in:
Dimitry Andric 2022-12-07 16:06:16 +01:00
parent 0f85c4d7e4
commit 4131f9bfd8
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/py-psutil/files/patch-psutil_arch_freebsd_sys__socks.c Normal file
View File

@ -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;