+ case "${usergroup_phase}" in
+ local run_cmd
+ run_cmd=run_su
+ shift
+ run_su /usr/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/libcpuid-0.5.1/work.log
+ su pbulk -c '"$@"' make /usr/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/libcpuid-0.5.1/work.log
=> Bootstrap dependency digest>=20211023: found digest-20220214
=> Checksum BLAKE2s OK for libcpuid/v0.5.1.tar.gz
=> Checksum SHA512 OK for libcpuid/v0.5.1.tar.gz
===> Installing dependencies for libcpuid-0.5.1
=> Tool dependency libtool-base>=2.4.2nb9: found libtool-base-2.4.7nb1
=> Tool dependency mktools-[0-9]*: found mktools-20220614
=> Tool dependency automake>=1.9: found automake-1.16.5nb3
=> Tool dependency autoconf>=2.58: found autoconf-2.72
=> Tool dependency nbpatch-[0-9]*: found nbpatch-20151107
=> Tool dependency cwrappers>=20150314: found cwrappers-20220403
=> Tool dependency checkperms>=1.1: found checkperms-1.12
===> Overriding tools for libcpuid-0.5.1
===> Extracting for libcpuid-0.5.1
===> Patching for libcpuid-0.5.1
=> Applying pkgsrc patches for libcpuid-0.5.1
=> Verifying /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/sysutils/libcpuid/patches/patch-configure.ac
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/sysutils/libcpuid/patches/patch-configure.ac
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-configure.ac,v 1.1 2022/04/12 22:22:26 nikita Exp $
|
|Upstream commit 1acaf9980b55ae180cc08db218b9face28202519
|from Alyssa Ross.
|
|Use popcount64 from libc when available
|
|Without this, we get a compiler error on NetBSD because the one in
|libc has a slightly different prototype.
|
|libcpuid_util.c:78:12: error: conflicting types for 'popcount64'
|   78 | static int popcount64(uint64_t mask)
|      |            ^~~~~~~~~~
|In file included from /nix/store/155rj8nqh3xd80vpa8hl35p3hk7pacys-include-netbsd-8.0/include/string.h:98,
|                 from libcpuid_util.c:30:
|/nix/store/155rj8nqh3xd80vpa8hl35p3hk7pacys-include-netbsd-8.0/include/strings.h:61:14: note: previous declaration of 'popcount64' was here
|   61 | unsigned int popcount64(__uint64_t) __constfunc;
|      |              ^~~~~~~~~~
|
|* Return unsigned int from popcount64
|
|Matches NetBSD libc, where popcount64 originates.
|
|--- configure.ac.orig
|+++ configure.ac
--------------------------
Patching file configure.ac using Plan A...
Hunk #1 succeeded at 43.
done
=> Verifying /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/sysutils/libcpuid/patches/patch-libcpuid_libcpuid_util.c
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/sysutils/libcpuid/patches/patch-libcpuid_libcpuid_util.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-libcpuid_libcpuid_util.c,v 1.1 2022/04/12 22:22:26 nikita Exp $
|
|Upstream commit 1acaf9980b55ae180cc08db218b9face28202519
|from Alyssa Ross.
|
|Use popcount64 from libc when available
|
|Without this, we get a compiler error on NetBSD because the one in
|libc has a slightly different prototype.
|
|libcpuid_util.c:78:12: error: conflicting types for 'popcount64'
|   78 | static int popcount64(uint64_t mask)
|      |            ^~~~~~~~~~
|In file included from /nix/store/155rj8nqh3xd80vpa8hl35p3hk7pacys-include-netbsd-8.0/include/string.h:98,
|                 from libcpuid_util.c:30:
|/nix/store/155rj8nqh3xd80vpa8hl35p3hk7pacys-include-netbsd-8.0/include/strings.h:61:14: note: previous declaration of 'popcount64' was here
|   61 | unsigned int popcount64(__uint64_t) __constfunc;
|      |              ^~~~~~~~~~
|
|* Return unsigned int from popcount64
|
|Matches NetBSD libc, where popcount64 originates.
|
|--- libcpuid/libcpuid_util.c.orig
|+++ libcpuid/libcpuid_util.c
--------------------------
Patching file libcpuid/libcpuid_util.c using Plan A...
Hunk #1 succeeded at 29.
Hunk #2 succeeded at 77.
Hunk #3 succeeded at 89.
done
===> Creating toolchain wrappers for libcpuid-0.5.1
===> Configuring for libcpuid-0.5.1
cd /home/pbulk/build/sysutils/libcpuid/work/libcpuid-0.5.1 && autoreconf --install
aclocal: warning: couldn't open directory 'm4': No such file or directory
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
configure.ac:40: installing './ar-lib'
configure.ac:39: installing './compile'
configure.ac:42: installing './config.guess'
configure.ac:42: installing './config.sub'
configure.ac:5: installing './install-sh'
configure.ac:5: installing './missing'
cpuid_tool/Makefile.am: installing './depcomp'
=> Modifying GNU configure scripts to avoid --recheck
=> Replacing config-guess with pkgsrc versions
=> Replacing config-sub with pkgsrc versions
=> Replacing install-sh with pkgsrc version
=> Checking for portability problems in extracted files
checking for a BSD-compatible install... /bin/install -c -o pbulk -g pbulk
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /home/pbulk/build/sysutils/libcpuid/work/.tools/bin/mkdir -p
checking for gawk... /bin/gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking whether make supports nested variables... (cached) yes
checking for x86_64-redhat-linux-gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether cc accepts -g... yes
checking for cc option to enable C11 features... -std=gnu11
checking whether cc -std=gnu11 understands -c and -o together... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of cc -std=gnu11... gcc3
checking for x86_64-redhat-linux-ar... no
checking for x86_64-redhat-linux-lib... no
checking for x86_64-redhat-linux-link... no
checking for ar... ar
checking the archiver (ar) interface... ar
checking for an ANSI C-conforming const... yes
checking build system type... x86_64-redhat-linux-gnu
checking host system type... x86_64-redhat-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... (cached) /bin/grep
checking for egrep... (cached) /bin/egrep
checking for fgrep... /bin/grep -F
checking for ld used by cc -std=gnu11... /home/pbulk/build/sysutils/libcpuid/work/.cwrapper/bin/ld
checking if the linker (/home/pbulk/build/sysutils/libcpuid/work/.cwrapper/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /bin/nm -B
checking the name lister (/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 2097152
checking how to convert x86_64-redhat-linux-gnu file names to x86_64-redhat-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-redhat-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /home/pbulk/build/sysutils/libcpuid/work/.cwrapper/bin/ld option to reload object files... -r
checking for x86_64-redhat-linux-file... no
checking for file... file
checking for x86_64-redhat-linux-objdump... no
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for x86_64-redhat-linux-dlltool... no
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for x86_64-redhat-linux-ar... ar
checking for archiver @FILE support... @
checking for x86_64-redhat-linux-strip... no
checking for strip... strip
checking for x86_64-redhat-linux-ranlib... no
checking for ranlib... ranlib
checking command to parse /bin/nm -B output from cc -std=gnu11 object... ok
checking for sysroot... no
checking for a working dd... /bin/dd
checking how to truncate binary pipes... /bin/dd bs=4096 count=1
checking for x86_64-redhat-linux-mt... no
checking for mt... no
checking if : is a manifest tool... no
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if cc -std=gnu11 supports -fno-rtti -fno-exceptions... no
checking for cc -std=gnu11 option to produce PIC... -fPIC -DPIC
checking if cc -std=gnu11 PIC flag -fPIC -DPIC works... yes
checking if cc -std=gnu11 static flag -static works... no
checking if cc -std=gnu11 supports -c -o file.o... /bin/rm: cannot remove 'conftest*': No such file or directory
yes
checking if cc -std=gnu11 supports -c -o file.o... (cached) yes
checking whether the cc -std=gnu11 linker (/home/pbulk/build/sysutils/libcpuid/work/.cwrapper/bin/ld -m elf_x86_64) supports shared libraries... yes
checking whether -lc should be explicitly linked in... /bin/rm: cannot remove 'conftest*': No such file or directory
no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
checking for stdint.h... (cached) yes
checking for popcount64... no
checking for doxygen... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating libcpuid.pc
config.status: creating libcpuid/Makefile
config.status: creating cpuid_tool/Makefile
config.status: creating tests/Makefile
config.status: creating libcpuid/Doxyfile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
/bin/rm: cannot remove 'libtoolT': No such file or directory
=> Modifying libtool scripts to use pkgsrc libtool
=> Modifying libtool scripts to use pkgsrc depcomp