From nobody Mon Nov 29 14:28:07 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CD59A18B5CD2; Mon, 29 Nov 2021 14:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J2nkw0rgxz3n1k; Mon, 29 Nov 2021 14:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE6F624104; Mon, 29 Nov 2021 14:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ATES7VA059311; Mon, 29 Nov 2021 14:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATES7X4059310; Mon, 29 Nov 2021 14:28:07 GMT (envelope-from git) Date: Mon, 29 Nov 2021 14:28:07 GMT Message-Id: <202111291428.1ATES7X4059310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d364adc09c05 - stable/13 - Hoist cddl prebuild lib dependency definitions out of a MK_ZFS block List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d364adc09c058ee838eef849072193b05d625f8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638196088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TZBiAQFggHn1y6IktFMDQySeRpnCSCMkBVQhzoYntCA=; b=lYmTSusuzjHE0xhIMQLceHD0NC/5We6jCPktpnjkKjgCdN7ZAFRyOIm4jJQes2IAZJBXkd 3A9ChsGG3u/t091zuVR+RlqnwKEnqoZHd2FU2tQ4T7ULh6dOVwFlZ7aSvAFaYs7Z2FUb10 3i9pJG+t9SQncHci61mdzgwb1+C3EMPmjQ1gzDmtch7AzLA7dswlFqFGyL+uZP0HAO/5Xk hQ3uoxHNr/2frcIggNMXAVFaZ5pwxQXHPXOWGaSWD2EdIR7AEgsNFdQqwJ2CGxOfyIWCJh dvms4Fw+vtzTaKj2aYcrbd1n+fC4Che8c4JYCaZ1+REzeEGp2iYgmr8UpwrR0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638196088; a=rsa-sha256; cv=none; b=Rbznh+aokJoptXIDB7f9JraQeAP0HI6hTt2NVcp0/Q+s+az5alGOo4B9gv1dYkeaSBPiB1 89YjNfBQoepVY1nmMrQ9ZC5rEuYuPLhXNGewmYNGXqObfdVVjGbfrWg6G77LhOCerFTm/J HWBkzdFQwUBHShIvYmut02xnqtuuRivzKjF8IUBDGQOQHegCvnKBGelpoVl2EPmy65Cqpp R9zPm6Ho5H4/KAEzTOsSCVTm90/i9BiSHr+uOK4ZudDzQc/TwXcAkpBPWhwsQwEaKAAyAm ojCeJz9nMY9UTq/kuQ+JLSS83QHhJDHJ3R8xWCmf232r3O3YUNX05JdXr4Cfeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d364adc09c058ee838eef849072193b05d625f8b commit d364adc09c058ee838eef849072193b05d625f8b Author: Mark Johnston AuthorDate: 2021-11-26 14:27:19 +0000 Commit: Mark Johnston CommitDate: 2021-11-29 14:27:49 +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") (cherry picked from commit 7b3642da21cb4b1c301d8c6b6ce0847d19d8a473) --- Makefile.inc1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 34bb10e6925f..995ed7af3e4b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2995,6 +2995,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" @@ -3006,10 +3008,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