Fixed LDADD library links in Makefiles for cross compilation builds

When building on native dev system, there are no issues but when
cross-compiling for target system, some linker errors are observed.
The only way to avoid these errors is by adjusting the Makefile.am
of those various components to add the library dependencies.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Petros Koutoupis <petros@petroskoutoupis.com>
Closes #10304

diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
index 1ffeef7fe189dc7735e21516aa41a9652e0f0b47..ddacf32c6dd50718db06db8bd7c05c4ba3a9d6e3 100644 (file)
--- a/cmd/mount_zfs/Makefile.am
+++ b/cmd/mount_zfs/Makefile.am
@@ -14,4 +14,5 @@ mount_zfs_SOURCES = \
 
 mount_zfs_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la

diff --git a/cmd/raidz_test/Makefile.am b/cmd/raidz_test/Makefile.am
index c04d101b885b1e11de546d0b15aed314995367ee..0b173ed505fde0d1f6941107d64aef6c82449d71 100644 (file)
--- a/cmd/raidz_test/Makefile.am
+++ b/cmd/raidz_test/Makefile.am
@@ -14,6 +14,7 @@ raidz_test_SOURCES = \
        raidz_bench.c
 
 raidz_test_LDADD = \
+       $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libzpool/libzpool.la
 
 raidz_test_LDADD += -lm -ldl

diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
index 40c0834af0a26a8a7208c80251deb0aa5c954ceb..82b000ce162e5b61b4c15a3ea407bc3b7c7f7d8a 100644 (file)
--- a/cmd/zed/Makefile.am
+++ b/cmd/zed/Makefile.am
@@ -38,6 +38,7 @@ zed_SOURCES = $(ZED_SRC) $(FMA_SRC)
 zed_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la
 
 zed_LDADD += -lrt

diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
index 71b48255e66bee127d28c12e5c58bc6e087c8d89..b056a6db545ec00c475c82316c9cff3342046665 100644 (file)
--- a/cmd/zinject/Makefile.am
+++ b/cmd/zinject/Makefile.am
@@ -9,4 +9,5 @@ zinject_SOURCES = \
 
 zinject_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la

diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
index 7b25726f498e0a18a56f981603993dbfe4c60731..5efa1318440d196839ff00f4f99c79e307bcaca1 100644 (file)
--- a/cmd/zpool/Makefile.am
+++ b/cmd/zpool/Makefile.am
@@ -22,6 +22,7 @@ endif
 zpool_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la
 
 if BUILD_FREEBSD

diff --git a/cmd/zstream/Makefile.am b/cmd/zstream/Makefile.am
index 892e1583072cffb32c7b79a78239a46431bbb968..ebc07d2eaa047e8bd743bcf3d16565fae1139d43 100644 (file)
--- a/cmd/zstream/Makefile.am
+++ b/cmd/zstream/Makefile.am
@@ -10,4 +10,5 @@ zstream_SOURCES = \
 
 zstream_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la

diff --git a/tests/zfs-tests/cmd/btree_test/Makefile.am b/tests/zfs-tests/cmd/btree_test/Makefile.am
index 632f0472668c53e3f16fff3f6150638cbf89feed..bf09cdb82da4263444cc421e5539a01ed42ca37c 100644 (file)
--- a/tests/zfs-tests/cmd/btree_test/Makefile.am
+++ b/tests/zfs-tests/cmd/btree_test/Makefile.am
@@ -29,4 +29,5 @@ btree_test_SOURCES = btree_test.c
 
 btree_test_LDADD = \
        $(top_builddir)/lib/libavl/libavl.la \
+       $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libzpool/libzpool.la

diff --git a/tests/zfs-tests/tests/functional/hkdf/Makefile.am b/tests/zfs-tests/tests/functional/hkdf/Makefile.am
index c1266214fefd632d5aa1a7aeecb93a57c30cccb4..378bcf531d847b32057e276851e9be8409b5554d 100644 (file)
--- a/tests/zfs-tests/tests/functional/hkdf/Makefile.am
+++ b/tests/zfs-tests/tests/functional/hkdf/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/config/Rules.am
 
-LDADD = $(top_builddir)/lib/libzpool/libzpool.la
+LDADD = \
+       $(top_builddir)/lib/libnvpair/libnvpair.la \
+       $(top_builddir)/lib/libzpool/libzpool.la
 
 AUTOMAKE_OPTIONS = subdir-objects
 

diff --git a/tests/zfs-tests/tests/functional/libzfs/Makefile.am b/tests/zfs-tests/tests/functional/libzfs/Makefile.am
index e9a703f4902d1c3686e3696469951f56d5cc71ad..545af77e7d1271b629e4771551f315662b5f0095 100644 (file)
--- a/tests/zfs-tests/tests/functional/libzfs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/libzfs/Makefile.am
@@ -10,6 +10,8 @@ dist_pkgdata_SCRIPTS = \
        libzfs_input.ksh
 
 many_fds_LDADD = \
+       $(top_builddir)/lib/libnvpair/libnvpair.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la \
        $(top_builddir)/lib/libzfs/libzfs.la
 
 pkgexec_PROGRAMS = many_fds