c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

libzutil depends on libnvpair

Browse Source 
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 <behlendorf1@llnl.gov>
Reivewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #10915
This commit is contained in:
Matthew Ahrens 2020-09-12 08:19:48 -07:00 committed by GitHub
parent 8e7fe49b25
commit 9b77c57d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Makefile.am
View File

@ -6,9 +6,13 @@ if BUILD_LINUX
SUBDIRS += libefi SUBDIRS += libefi
endif 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 # libzutil depends on libefi if present
SUBDIRS += libzutil libunicode 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. # incorporate the eight convenience libraries given above.
SUBDIRS += libuutil libnvpair libzfs_core libzfs libzpool SUBDIRS += libuutil libzfs_core libzfs libzpool

1
lib/libzutil/Makefile.am
View File

@ -40,6 +40,7 @@ libzutil_la_SOURCES = $(USER_C)
libzutil_la_LIBADD = \ libzutil_la_LIBADD = \
$(abs_top_builddir)/lib/libavl/libavl.la \ $(abs_top_builddir)/lib/libavl/libavl.la \
$(abs_top_builddir)/lib/libtpool/libtpool.la \ $(abs_top_builddir)/lib/libtpool/libtpool.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libspl/libspl.la $(abs_top_builddir)/lib/libspl/libspl.la
if BUILD_LINUX if BUILD_LINUX