Hi,
It seems that CTASSERT in netinet/in.h conflicts with
CTASSERT in external/cddl/osnet/dist/uts/common/sys/debug.h.
Ryo ONODERA <r...@tetera.org> writes:
> Hi,
>
> However I have gotten another failure:
>
> --- dt_print.pico ---
> In file included from /usr/src/external/cddl/osnet/sys/sys/debug.h:51,
> from /usr/src/external/cddl/osnet/sys/sys/uio.h:64,
> from /usr/world/9.99/amd64/dest/usr/include/sys/socket.h:99,
> from
> /usr/src/external/cddl/osnet/lib/libdtrace/../../dist/lib/
> libdtrace/common/dt_print.c:76:
> /usr/world/9.99/amd64/dest/usr/include/netinet/in.h:162:1: error: macro
> "__CTASS
> ERT" passed 2 arguments, but takes just 1
> 162 | CTASSERT(sizeof(struct in_addr) == 4);
> | ^~~~~~~~
>
> Ryo ONODERA <r...@tetera.org> writes:
>
>> Hi,
>>
>> NetBSD Test Fixture <brac...@netbsd.org> writes:
>>
>>> This is an automatically generated notice of a NetBSD-current/i386
>>> build failure.
>>>
>>> The failure occurred on babylon5.netbsd.org, a NetBSD/amd64 host,
>>> using sources from CVS date 2021.02.03.12.11.34.
>>>
>>> An extract from the build.sh output follows:
>>>
>>> *** Failed target: dependall-../external/bsd/am-utils/lib
>>> *** Failed command: _makedirtarget() { dir="$1"; shift; target="$1";
>>> shift; case "${dir}" in /*) this="${dir}/"; real="${dir}" ;; .)
>>> this="lib/"; real="/tmp/build/2021.02.03.12.11.34-i386/src/lib" ;; *)
>>> this="lib/${dir}/";
>>> real="/tmp/build/2021.02.03.12.11.34-i386/src/lib/${dir}" ;; esac;
>>> show=${this:-.}; echo "${target} ===> ${show%/}${1:+ (with: $@)}"; cd
>>> "${real}" && /tmp/build/2021.02.03.12.11.34-i386/tools/bin/nbmake
>>> _THISDIR_="${this}" "$@" ${target}; }; _makedirtarget
>>> ../external/bsd/am-utils/lib dependall
>>> *** Error code 2
>>> Stop.
>>> nbmake[5]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src/lib
>>> *** [build_install] Error code 1
>>> nbmake[4]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src/lib
>>> 1 error
>>> nbmake[4]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src/lib
>>> nbmake[3]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src
>>> nbmake[2]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src
>>> nbmake[1]: stopped in /tmp/build/2021.02.03.12.11.34-i386/src
>>> nbmake: stopped in /tmp/build/2021.02.03.12.11.34-i386/src
>>> ERROR: Failed to make release
>>>
>>> The following commits were made between the last successful build and
>>> the failed build:
>>>
>>> 2021.02.03.11.52.23 roy src/sys/netinet/tcp_debug.h,v 1.20
>>> 2021.02.03.11.53.43 roy src/sys/net/if_arp.h,v 1.36
>>> 2021.02.03.11.53.43 roy src/sys/net/if_ether.h,v 1.83
>>> 2021.02.03.11.53.43 roy src/sys/net/if_gre.h,v 1.46
>>> 2021.02.03.11.53.43 roy src/sys/netinet/if_ether.h,v 1.36
>>> 2021.02.03.11.53.43 roy src/sys/netinet/igmp.h,v 1.14
>>> 2021.02.03.11.53.43 roy src/sys/netinet/in.h,v 1.113
>>> 2021.02.03.11.53.43 roy src/sys/netinet/ip.h,v 1.37
>>> 2021.02.03.11.53.43 roy src/sys/netinet/ip6.h,v 1.28
>>> 2021.02.03.11.53.43 roy src/sys/netinet/ip_icmp.h,v 1.42
>>> 2021.02.03.11.53.43 roy src/sys/netinet/ip_mroute.h,v 1.34
>>> 2021.02.03.11.53.43 roy src/sys/netinet/ip_var.h,v 1.132
>>> 2021.02.03.11.53.43 roy src/sys/netinet/tcp.h,v 1.36
>>> 2021.02.03.11.53.43 roy src/sys/netinet/tcp_var.h,v 1.194
>>> 2021.02.03.11.53.43 roy src/sys/netinet/udp.h,v 1.18
>>> 2021.02.03.11.53.43 roy src/sys/netinet/udp_var.h,v 1.48
>>> 2021.02.03.12.11.34 roy src/sys/net/if_llc.h,v 1.22
>>>
>>> Logs can be found at:
>>>
>>>
>>> http://releng.NetBSD.org/b5reports/i386/commits-2021.02.html#2021.02.03.12.11.34
>>
>> if_ether.h has no #ifdef CTASSERT ... #endif.
>> The other file has this guard.
>> I think the following patch will work.
>>
>> Index: sys/netinet/if_ether.h
>> ===================================================================
>> RCS file: /cvsroot/src/sys/netinet/if_ether.h,v
>> retrieving revision 1.36
>> diff -u -r1.36 if_ether.h
>> --- sys/netinet/if_ether.h 3 Feb 2021 11:53:43 -0000 1.36
>> +++ sys/netinet/if_ether.h 3 Feb 2021 13:47:16 -0000
>> @@ -76,7 +76,9 @@
>> u_int8_t arp_tha[ETHER_ADDR_LEN]; /* target hardware address */
>> u_int8_t arp_tpa[4]; /* target protocol address */
>> };
>> +#ifdef CTASSERT
>> CTASSERT(sizeof(struct ether_arp) == 28);
>> +#endif
>> #define arp_hrd ea_hdr.ar_hrd
>> #define arp_pro ea_hdr.ar_pro
>> #define arp_hln ea_hdr.ar_hln
>>
>>
>> --
>> Ryo ONODERA // r...@tetera.org
>> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
>
> --
> Ryo ONODERA // r...@tetera.org
> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
--
Ryo ONODERA // r...@tetera.org
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
