https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc9_build broken again after openzfs merge: multiple definitions building --- all_subdir_rescue ---

Looks like . . .

/workspace/src/sys/contrib/openzfs/module/zstd/lib/common/error_private.h
and:
/workspace/src/sys/contrib/zstd/lib/common/error_private.h

are both used in building in:

/tmp/obj/workspace/src/amd64.amd64/rescue/rescue

and each is providing various definitions that the other also does:

multiple definition of `ZSTD_versionNumber'
multiple definition of `ZSTD_versionString';
multiple definition of `ZSTD_isError';
multiple definition of `ZSTD_getErrorName';
multiple definition of `ZSTD_getErrorCode';
multiple definition of `ZSTD_getErrorString';

Looks like this goes back to:

Build #3075 (Mar 8, 2022 9:33:24 PM)
[c03c5b1c8091: "zfs: merge openzfs/zfs@a86e08941 (master) into main"]

after Build #3074 (Mar 8, 2022 6:16:32 PM) had built fine.


===
Mark Millard
marklmi at yahoo.com