From 645ca45a13c215902ddc339ac41985caf3035a4e Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Sat, 12 Sep 2020 08:19:48 -0700 Subject: [PATCH] libzutil depends on libnvpair libzutil depends on libnvpair, but this dependency is undeclared in the build system. Therefore it isn't possible to make a new command that depends on libzutil, but does not (directly) depend on libnvpair. This commit makes this dependency explicit. Reviewed-by: Brian Behlendorf Reivewed-by: Ryan Moeller Signed-off-by: Matthew Ahrens Closes #10915 --- lib/Makefile.am | 8 ++++++-- lib/libzutil/Makefile.am | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index dda87e41c0..93ee30697d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -6,9 +6,13 @@ if BUILD_LINUX SUBDIRS += libefi endif +# libnvpair is installed as part of the final build product +# libzutil depends on it, so it must be compiled before libzutil +SUBDIRS += libnvpair + # libzutil depends on libefi if present SUBDIRS += libzutil libunicode -# These five libraries, which are installed as the final build product, +# These four libraries, which are installed as the final build product, # incorporate the eight convenience libraries given above. -SUBDIRS += libuutil libnvpair libzfs_core libzfs libzpool +SUBDIRS += libuutil libzfs_core libzfs libzpool diff --git a/lib/libzutil/Makefile.am b/lib/libzutil/Makefile.am index cd03ba19d5..1b55ef6807 100644 --- a/lib/libzutil/Makefile.am +++ b/lib/libzutil/Makefile.am @@ -40,6 +40,7 @@ libzutil_la_SOURCES = $(USER_C) libzutil_la_LIBADD = \ $(abs_top_builddir)/lib/libavl/libavl.la \ $(abs_top_builddir)/lib/libtpool/libtpool.la \ + $(abs_top_builddir)/lib/libnvpair/libnvpair.la \ $(abs_top_builddir)/lib/libspl/libspl.la if BUILD_LINUX