git: 7b3642da21cb - main - Hoist cddl prebuild lib dependency definitions out of a MK_ZFS block

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b3642da21cb4b1c301d8c6b6ce0847d19d8a473

commit 7b3642da21cb4b1c301d8c6b6ce0847d19d8a473
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-11-26 14:27:19 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-11-26 14:39:09 +0000

    Hoist cddl prebuild lib dependency definitions out of a MK_ZFS block
    
    The compilation of several libraries under cddl/lib is not conditional
    on MK_ZFS = "yes", so their dependency on libspl is not conditional
    either.  Unbreak buildworld when WITHOUT_ZFS is set.
    
    Reported by:    bz
    Fixes:          9e9c651caceb ("cddl: fix missing ZFS library dependencies")
    MFC after:      1 week
---
 Makefile.inc1 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1ba3716a02db..e3b46b3e40bc 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3026,6 +3026,8 @@ _cddl_lib_libavl= cddl/lib/libavl
 _cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libspl= cddl/lib/libspl
 
+cddl/lib/libavl__L: cddl/lib/libspl__L
+cddl/lib/libnvpair__L: cddl/lib/libspl__L
 cddl/lib/libuutil__L: cddl/lib/libavl__L cddl/lib/libspl__L
 
 .if ${MK_ZFS} != "no"
@@ -3037,10 +3039,6 @@ _cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib_libzfs= cddl/lib/libzfs
 _cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv
 
-cddl/lib/libavl__L: cddl/lib/libspl__L
-
-cddl/lib/libnvpair__L: cddl/lib/libspl__L
-
 cddl/lib/libtpool__L: cddl/lib/libspl__L
 
 cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libtpool__L