ZFS: Unbreak the world build on CURRENT with the OpenZFS import at r364746.
Submitted by: Neel Chauhan <neel AT neelc DOT org>
nc on Aug 25 2020, 5:42 PM.Authored by
@neel_neelc.org can you tell me a bit more about your environment, make universe builds for all of us and only the powerpcspe tinderbox is currently broken because of these changes. I'm happy to commit these changes I just want to know what it's fixing.
This patch fixes the build issue complaining about:
not being "lz4"
being #define'd twice
This is an older Haswell homebuilt PC running 13-CURRENT amd64.
It could also be an older copy of clang/llvm.
This is the error I get without the patch:
/usr/src/sys/cddl/contrib/opensolaris/common/lz4/lz4.c:55:9: error: 'ASSERT' macro redefined [-Werror,-Wmacro-redefined] #define ASSERT assert ^ /usr/src/sys/contrib/openzfs/lib/libspl/include/assert.h:138:9: note: previous definition is here #define ASSERT VERIFY ^ /usr/src/sys/cddl/contrib/opensolaris/common/lz4/lz4.c:57:10: error: 'lz4.h' file not found with <angled> include; use "quotes" instead #include <lz4.h> ^~~~~~~ "lz4.h"
I've been able to keep a NO_CLEAN tree going for several years; it does break occasionally but we have a standard, if ugly, way of addressing the resulting dependency issues when they occur.