zabbix-server60 build problem on NetBSD/9-stable

[Mike Pumford <mpumford%mudcovered.org.uk@localhost>]

depbase=`echo lld_trigger.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; gcc 
-DHAVE_CONFIG_H -I. -I../../../include    -DCURL_DISABLE_TYPECHECK 
-I/usr/pkg/include -I/usr/include -DLDAP_DEPRECATED -I/usr/include/krb5 
-I/usr/pkg/include -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include 
-I/usr/include -DLDAP_DEPRECATED -I/usr/include/krb5 -I/usr/pkg/include 
-MT lld_trigger.o -MD -MP -MF $depbase.Tpo -c -o lld_trigger.o 
lld_trigger.c && mv -f $depbase.Tpo $depbase.Po
--- lld_host.o ---
lld_host.c:3888:21: error: conflicting types for 'popcount64'
 static zbx_uint64_t popcount64(zbx_uint64_t mask)
                     ^~~~~~~~~~
In file included from /usr/include/string.h:98:0,
                 from ../../../include/sysinc.h:118,
                 from ../../../include/common.h:23,
                 from lld.h:23,
                 from lld_host.c:20:
/usr/include/strings.h:61:14: note: previous declaration of 'popcount64' 
was here
 unsigned int popcount64(__uint64_t) __constfunc;
              ^~~~~~~~~~
*** [lld_host.o] Error code 1

make[3]: stopped in 
/comp/obj/pkgsrc/sysutils/zabbix60-server/work/zabbix-6.0.13/src/zabbix_server/lld

The inclusion of strings.h where the function is defined is guarded by:

#if defined(_NETBSD_SOURCE)

The zabbix build isn't defining that according to the configure output:


Configuration:

  Detected OS:           netbsd
  Install path:          /usr/pkg
  Compilation arch:      netbsd

  Compiler:              gcc
  Compiler flags:        -I/usr/pkg/include -O2 -fPIC 
-D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/include -DLDAP_DEPRECATED 
-I/usr/include/krb5 -I/usr/pkg/include

  Library-specific flags:
    database:                -I/usr/pkg/include
    libpcre2:              -I/usr/pkg/include
    libXML2:               -I/usr/pkg/include/libxml2
    Net-SNMP:               -I/usr/include -I/usr/pkg/include 
-I/usr/include -I/usr/pkg/include -I/usr/include 
-I/usr/pkg/lib/perl5/5.36.0/x86_64-netbsd-thread-multi/CORE 
-I/usr/include -I/usr/pkg/include -I. -I/usr/pkg/include
    OpenIPMI:              -I/usr/pkg/include
    libssh2:               -I/usr/pkg/include
    TLS:                   -I/usr/include
    LDAP:                  -I/usr/include
    iconv:                 -I/usr/include
    libevent:              -I/usr/include

  Enable server:         yes
  Server details:
    With database:         PostgreSQL
    WEB Monitoring:        cURL
      SSL certificates: 
/usr/pkg/share/zabbix-server-postgresql/zabbix/ssl/certs
      SSL keys: 
/usr/pkg/share/zabbix-server-postgresql/zabbix/ssl/keys
    SNMP:                  yes
    IPMI:                  yes
    SSH:                   yes (libssh2)
    TLS:                   OpenSSL
    ODBC:                  no
    Linker flags:           -L/usr/pkg/lib    -L/usr/pkg/lib 
-L/usr/pkg/lib  -L/usr/pkg/lib  -L/usr/pkg/lib -L/usr/lib  -L/usr/lib 
-L/usr/lib -L/usr/lib  -L/usr/lib -L/usr/pkg/lib -L/usr/lib 
-L/usr/pkg/lib -L/usr/pkg/lib -L/usr/pkg/lib -rdynamic -Wl,-zrelro 
-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib 
-L/usr/pkg/lib -L/usr/lib
    Libraries:                -lpq  -lxml2    -lnetsnmp -lssh2 
-lOpenIPMI -lOpenIPMIposix -lz -lpthread -levent -lssl -lcrypto -lldap 
-llber   -lcurl -lkvm -lm -lexecinfo   -lpcre2-8
    Configuration file:    /usr/pkg/etc/zabbix_server.conf
    External scripts: 
/usr/pkg/share/zabbix-server-postgresql/zabbix/externalscripts
    Alert scripts: 
/usr/pkg/share/zabbix-server-postgresql/zabbix/alertscripts
    Modules:               /usr/pkg/lib/modules

  Enable proxy:          no

  Enable agent:          no

  Enable agent 2:        no

  Enable web service:    no

  Enable Java gateway:   no

  LDAP support:          yes
  IPv6 support:          yes

Mike