Re: git: 0654456e0611 - main - sysutils/lsof: fix breakage after 3a0cdb2675e6
Date: Mon, 13 Jan 2025 07:30:25 UTC
Am 13.01.25 um 05:56 schrieb Cy Schubert:
> In message <202501112057.50BKvD38009217@gitrepo.freebsd.org>, Larry
> Rosenman wr
> ites:
>> The branch main has been updated by ler:
>>
>> URL: https://cgit.FreeBSD.org/ports/commit/?id=0654456e061181e74fd0eb06f9b966
>> a4e759769d
>>
>> commit 0654456e061181e74fd0eb06f9b966a4e759769d
>> Author: Larry Rosenman <ler@FreeBSD.org>
>> AuthorDate: 2025-01-11 20:51:00 +0000
>> Commit: Larry Rosenman <ler@FreeBSD.org>
>> CommitDate: 2025-01-11 20:51:00 +0000
>>
>> sysutils/lsof: fix breakage after 3a0cdb2675e6
>>
>> - put /usr/src first.
>> ---
>> sysutils/lsof/Makefile | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
>> index f65273c5c932..a10d7db4320a 100644
>> --- a/sysutils/lsof/Makefile
>> +++ b/sysutils/lsof/Makefile
>> @@ -3,6 +3,7 @@
>>
>> PORTNAME= lsof
>> DISTVERSION= 4.99.4
>> +PORTREVISION= 1
>> PORTEPOCH= 8
>> CATEGORIES= sysutils
>>
>> @@ -40,7 +41,7 @@ BOOKE_CFLAGS= -DBOOKE
>> CONFIGURE_SCRIPT= Configure
>> CONFIGURE_ARGS= -n freebsd
>> CONFIGURE_ENV= FREEBSD_SYS="${SRC_BASE}/sys" \
>> - LSOF_CC="${CC}"
>> + LSOF_CC="${CC} -idirafter /usr/src"
>
> This is wrong. If /usr/src is updated, i.e. git pull, but not installed,
> i.e. installworld, header files and libraries may be mismatched.
>
> Note: The follow-on 1ec769ae9a64 perpetuates this wrong-ness.
>
Now it builds fine on 14.x and 13.x, but continues to fail on 15.0-CURRENT:
===> Building for lsof-4.99.4_1,8
(cd lib; /usr/bin/make DEBUG="-O2" CFGF="-pipe -fstack-protector-strong
-fno-strict-aliasing -DNEEDS_BOOL_TYPEDEF -DHASTASKS -DHAS_DUP2
-DHAS_CLOSEFROM -DHASEFFNLINK=i_effnlink -DHASF_VNODE -DHAS_FILEDESCENT
-DHAS_TMPFS -DHASWCTYPE_H -DHASSBSTATE -DHAS_KVM_VNODE -DHAS_UFS1_2
-DHAS_VM_MEMATTR_T -DNEEDS_DEVICE_T -DHAS_CDEV2PRIV -DHAS_SYS_SX_H
-DHASMSDOSFS -DHAS_V_LOCKF -DHAS_LOCKF_ENTRY -DHAS_NO_6PORT
-DHAS_NO_6PPCB -DNEEDS_BOOLEAN_T -DHAS_SB_CCC -DFREEBSDV=15000
-DHASFDESCFS=2 -DHASPROCFS -DHASPSEUDOFS -DHASNULLFS -DHAS9660FS
-DHASIPv6 -DHASUTMPX -DHAS_XTCPCB_TMAXSEG -DHAS_KF_SOCK_SENDQ
-DHAS_KF_FILE_NLINK -DHAS_STRFTIME -DLSOF_VSTR=\"15.0-CURRENT\"")
cc -pipe -fstack-protector-strong -fno-strict-aliasing
-DNEEDS_BOOL_TYPEDEF -DHASTASKS -DHAS_DUP2 -DHAS_CLOSEFROM
-DHASEFFNLINK=i_effnlink -DHASF_VNODE -DHAS_FILEDESCENT -DHAS_TMPFS
-DHASWCTYPE_H -DHASSBSTATE -DHAS_KVM_VNODE -DHAS_UFS1_2
-DHAS_VM_MEMATTR_T -DNEEDS_DEVICE_T -DHAS_CDEV2PRIV -DHAS_SYS_SX_H
-DHASMSDOSFS -DHAS_V_LOCKF -DHAS_LOCKF_ENTRY -DHAS_NO_6PORT
-DHAS_NO_6PPCB -DNEEDS_BOOLEAN_T -DHAS_SB_CCC -DFREEBSDV=15000
-DHASFDESCFS=2 -DHASPROCFS -DHASPSEUDOFS -DHASNULLFS -DHAS9660FS
-DHASIPv6 -DHASUTMPX -DHAS_XTCPCB_TMAXSEG -DHAS_KF_SOCK_SENDQ
-DHAS_KF_FILE_NLINK -DHAS_STRFTIME -DLSOF_VSTR="15.0-CURRENT"
-I/usr/src/sys -I.. -I../include -Idialects/freebsd -O2 -c ckkv.c -o ckkv.o
In file included from ckkv.c:31:
In file included from ./common.h:253:
In file included from ../dlsof.h:171:
In file included from /usr/src/sys/rpc/rpc.h:68:
/usr/src/sys/rpc/svc.h:341:25: error: field has incomplete type 'struct
sysctl_ctx_list'
341 | struct sysctl_ctx_list sp_sysctl;
| ^
/usr/src/sys/rpc/svc.h:341:9: note: forward declaration of 'struct
sysctl_ctx_list'
341 | struct sysctl_ctx_list sp_sysctl;
| ^
/usr/src/sys/rpc/svc.h:568:12: warning: declaration of 'struct
sysctl_oid_list' will not be visible outside of this function [-Wvisibility]
568 | struct sysctl_oid_list *sysctl_base);
| ^
1 warning and 1 error generated.
*** Error code 1
This is in Poudiere with FreeBSD 15.0-CURRENT 1500030 amd64.
>> BUILD_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
>>
>> # GCC needs -lzfs -lzpool for reasons unknown. If someone can
>>
>
>