From nobody Fri Nov 26 14:39:26 2021 X-Original-To: dev-commits-src-all@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 4C55E18AD708; Fri, 26 Nov 2021 14:39:27 +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 4J0y7L6hxdz4n5w; Fri, 26 Nov 2021 14:39:26 +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 C59FD22C5; Fri, 26 Nov 2021 14:39:26 +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 1AQEdQLO016340; Fri, 26 Nov 2021 14:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQEdQDm016339; Fri, 26 Nov 2021 14:39:26 GMT (envelope-from git) Date: Fri, 26 Nov 2021 14:39:26 GMT Message-Id: <202111261439.1AQEdQDm016339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7b3642da21cb - main - Hoist cddl prebuild lib dependency definitions out of a MK_ZFS block List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7b3642da21cb4b1c301d8c6b6ce0847d19d8a473 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637937567; 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=YhJUaT9fi1cSuXIM2+VeSEF7fF+9lBbNDmZFGkWq14Y=; b=iUiTex0yjLjHSF4IHvQj8mWvYHLBOwbgjJ5a8i8vbU0FA62nE0EVqTYSjdYPeDgcwp1HSV 29K3f0RyV1dajJDmH7zeB2VHyrBqsc1dQJxwgacIsEdl9xbkrHe1TXcgWqAECRnLLT5b0Y QEjhBY9mAEDX/bYUICizh/fuvmGx2hEGPkvEcmdwu8KAedl2XQyl7jJBcsXV9hSSOwSCX0 bWaTw0tMap4kInvMT6bJLaICIJCd1QzaRV8Ml7arPjMSbUfA6lMc4giDca+kmT11x6q+fO TNzHzywBfzdlpWdziYDJqP9k07luRqITrjXymY+FyfRD0DuYGyplGbJ9s5yClw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637937567; a=rsa-sha256; cv=none; b=ambTw6I17/Qd5KyuOND5Ij9mqkjBWhAFHbLdhNEIo30eghZev04V8rCfeEGHzJCFucwHFp +1zQVsyGPgJwCKuq6sFeVo+BqZ3+c7lyLZSpOQFhGeyjRh0avWyAyJO1bGOdApQv0z3Apn m+FwFzNYyKL9t30dFP9SSzBrjQfEbZOOAmUqE3PXeQAw9239XjLG6I6bo4Ol7By3dOVaKk ybTTxKrkyFIfzkXKsxzgbUY7sWyOqumRbIGzp3j1lFzHH37O/OAF4kVdyD3n+5KQEjfFHT pekPh1JCf096U5vKRCwkdOVL3bds60JXxcBWJZfvqqPEj/1LWXkAzPPb9yyrLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b3642da21cb4b1c301d8c6b6ce0847d19d8a473 commit 7b3642da21cb4b1c301d8c6b6ce0847d19d8a473 Author: Mark Johnston AuthorDate: 2021-11-26 14:27:19 +0000 Commit: Mark Johnston 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