From nobody Mon Oct 03 23:11:20 2022 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 4MhGmS4LY9z4V1NJ; Mon, 3 Oct 2022 23:11:20 +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 4MhGmS36sPz3Q7R; Mon, 3 Oct 2022 23:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664838680; 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=Pq21yR65bBMMzThAzaj5eZGswCGtx7YILSXXwtea0mM=; b=uOiiPbSIVKbUzyDqYEQgfStGysgyAwTbA0BY7Lv8fcry+SQpbWRo+yW0RYpClVViUj+TI7 WiQScyXCdnbSJiH13Wyz002LQO4FZXdPndJr3TiXJMH4w3TjWp5a2TrYSafY+EHYexadq3 zU3opJsodM6CWdWikCWtW4EaEYsCZSXdYQIU+X7hyOvzfwb0AVGSJbetSEpySGzAqOJgtE iGcKzU2NJDxY4gQfEj9/h+0amlY9DMusI3+ARoXdgEVIaHad8G5VexHuPulPm8RAB17si0 +lgrvObpB93rPDsEUExoQG0SWSUP88DjDvpa4R87ZcIBIWNNbEcv2F/iHes0LA== 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 4MhGmS2DD5zMm8; Mon, 3 Oct 2022 23:11:20 +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 293NBKxr065569; Mon, 3 Oct 2022 23:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293NBKEd065568; Mon, 3 Oct 2022 23:11:20 GMT (envelope-from git) Date: Mon, 3 Oct 2022 23:11:20 GMT Message-Id: <202210032311.293NBKEd065568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5e4854cbf8d8 - main - rescue: Link libzutil after libzfs. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e4854cbf8d8a9b056472967d15e1021d36fcae1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664838680; 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=Pq21yR65bBMMzThAzaj5eZGswCGtx7YILSXXwtea0mM=; b=NJupoqxtMas4R1dor2j5Liuh9Dk4rUm3+PCR9MrQTjofUk/5CNkm0JrMSRh2YqflYW51iW wDX+zi6IPaokfDXR8dVVFNwAw1FB93J/1KDZVCqXzW3muStGDtcFjugaCng+0HvBOxyL74 bwh6j2KoTHHdZZA7TW4uFotSBnEQ4IvzoeoX+lYJCTIukNfjY5UNXGn5SLiXHW6yLc8SwQ LD/3SZQ0OY4QIhmyc5h5QtgmhHwRcnwmzYdFikDKMklfYd6JvYM/qAYItPpqs4kqYlL2ej 0KB/o3kJuAYS8blf6aBQyhV+0yMAPq7kOffK29inGMvxvHub3/L7Zyp4AVgddQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664838680; a=rsa-sha256; cv=none; b=j+zyBp8dg2iV8B7kwO91sNiKlxxwTD5qtx/3Po10bPcF4iK43JKxf05mmZPLKDd4q7p4vK Z/WW/g6XA3oPazxJpRa9atq0LIpXXyOihZLt8A80Ju160NZK7iIWB9aQeAscxO7gkOAEsU PBD7fS6rChpJpeZy19qJNsekDgD3i9lqJXEorHKH9a0vc55wF90k3lgYQXvL1afzkYtYDb iY58ITO4BtgmG4/edsaS67dJnj7+VKrvGLZKWZ8tywenZc8DFZJv1nCrqP34JrrK0VsR1G Ct2K/zAihYkfzUE1z21pmp0fNAEiAjrNbSJHESXDQv++D1SclRJcUsAkLiIOwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5e4854cbf8d8a9b056472967d15e1021d36fcae1 commit 5e4854cbf8d8a9b056472967d15e1021d36fcae1 Author: John Baldwin AuthorDate: 2022-10-03 23:10:42 +0000 Commit: John Baldwin CommitDate: 2022-10-03 23:10:42 +0000 rescue: Link libzutil after libzfs. libzfs depends on symbols defined in libzutil. For static linking ld.bfd is less forgiving than lld, so rescue was failing to link when using ld.bfd due to unresolved symbols from libzutil used by libzfs. Reviewed by: imp, kib, emaste Differential Revision: https://reviews.freebsd.org/D36811 --- rescue/rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 3c758a41f294..cc4c13c0a624 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -140,8 +140,8 @@ CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl CRUNCH_LIBS_zfs+= ${LIBBE} \ ${LIBZPOOL} \ - ${LIBZUTIL} \ ${LIBZFS} \ + ${LIBZUTIL} \ ${LIBZFS_CORE} \ ${LIBZFSBOOTENV} \ ${LIBICP_RESCUE} \