diff options
| author | Matthew Ahrens <[email protected]> | 2020-09-12 08:19:48 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-12 08:19:48 -0700 |
| commit | 9b77c57d5a346acc5edb5f60918cf00b815da655 (patch) | |
| tree | 019764553b10d931cbf0fcfe13473827a960766f /lib | |
| parent | 8e7fe49b25d63e855a8d230d2775f99d722818ff (diff) | |
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 <[email protected]>
Reivewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Closes #10915
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/libzutil/Makefile.am | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index dda87e41c..93ee30697 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 cd03ba19d..1b55ef680 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 |