From nobody Tue May 24 20:59:56 2022 X-Original-To: dev-commits-src-main@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 183221B4FB59; Tue, 24 May 2022 20:59:58 +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 4L765n2ZKfz4jhV; Tue, 24 May 2022 20:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653425997; 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=fC0ACi4k2C3FGjAxUU6ezIb5v3Sy+Xsj+f6X2oBMU+w=; b=ZiVBUAnX3L+6EJAH50mUyy8lzc7rpR07gf0OIK+7+7iI2XvZ9zpfgGV1J8UYU/DewiXqxo hyTLKgGmBVmEAmwvVxrMYQWYnzb6RhBvIVXkWZ86jao4In0EPNfCI0QbMSe/acQP2fg43l AMopZHAUs9vlaUG3OC/w3GCwgaSr80n+xhSr0OycB5Bcn5ITeqNpWbMI0CxxnDOdgQwR8X ydhU0AnF6aQqdK2CHCvDY+PqALt6TD8Notl70QVaEbhS4SJeJdxoCLqNMUgzHOuovZT/vI PPmK2X6Twngh7n008EzVQQnAgFcqd8tWalIG4ic4XuLpt8bTMOCCEbzKhK8ACQ== 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 C704B3B3C; Tue, 24 May 2022 20:59:56 +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 24OKxufS036835; Tue, 24 May 2022 20:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OKxumF036834; Tue, 24 May 2022 20:59:56 GMT (envelope-from git) Date: Tue, 24 May 2022 20:59:56 GMT Message-Id: <202205242059.24OKxumF036834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3aaed4cb8c6a - main - Fix conflict between libnvpair and libnv when building rescue binaries. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aaed4cb8c6a7dd3441b3d89501a79581179e288 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653425997; 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=fC0ACi4k2C3FGjAxUU6ezIb5v3Sy+Xsj+f6X2oBMU+w=; b=R/X96YO8zQByiboKjgSv59c7lFd/XTZdPcZDhLl88pkFaRQD6L8cXXau1i1J87vv0Ao04f bFVulNhYlNhSyaYY0QSdnUeuGRH0mEGr8x0pYVNP2rwf+azI7Va28yKQoyqzI2Vve3syO2 AwcaE4vzO8OuRhS9Jm7blfjT1pFIHBIYYiq5wEVNyL+MiNbrqQhnapT9+HidWATavs7pQV 9EO6B2skuZsDg+XINYkvGLxL+sP6O4XtI5aJKJESA2ae845/0a+bC8Diokceg8sC3Spd+a C7xtwte92Cet5PBB++6i6zP1ARsgeLXwJ2rqEElVMb2qs+m8BwCpJrb5Zid1Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653425997; a=rsa-sha256; cv=none; b=ep3c859o4F+9024X+Dp7uHGrnmuJauW416/56y9+gDFxT22K28z8jVadB6t3hUYCssvjmP eAwEclXY7oiILzHL+0DZo78upnHdOSAkXxYFaxfeBYZabX4M7CAk5vVDQwrsISrua9y5gQ lgPCTzDchEwTsrLgbqHcSvG0fLtDor3s4ikpe60+mVQXhLVsLfdX8Dfg+0+WcK/FISGlF/ zZ8E6kKz+IdzNsurFakM7rACbEgVRc3V7P9jVxx9OtpdYkN2TfE9XklvPbwcpWYIeWOcbz 1DpzJO8jevmULoi7PnR6vyV2RkhCFeHxAnmtkb+Y1Wu8BluFencbKt7UJjvBMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3aaed4cb8c6a7dd3441b3d89501a79581179e288 commit 3aaed4cb8c6a7dd3441b3d89501a79581179e288 Author: Konstantin Belousov AuthorDate: 2022-04-12 02:23:44 +0000 Commit: Konstantin Belousov CommitDate: 2022-05-24 20:59:33 +0000 Fix conflict between libnvpair and libnv when building rescue binaries. Submitted by: hselasky Reviewed by: jhb Sponsored by: NVIDIA Networking MFC after: 3 weeks Differential revision: https://reviews.freebsd.org/D32551 --- rescue/rescue/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 216656be36a9..3c758a41f294 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -137,8 +137,18 @@ CRUNCH_PROGS_usr.sbin+= zdb CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma .if ${MK_ZFS} != "no" -CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem -CRUNCH_LIBS+= -lbe -lzfsbootenv -lzutil -ltpool -lspl -licp_rescue +CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl +CRUNCH_LIBS_zfs+= ${LIBBE} \ + ${LIBZPOOL} \ + ${LIBZUTIL} \ + ${LIBZFS} \ + ${LIBZFS_CORE} \ + ${LIBZFSBOOTENV} \ + ${LIBICP_RESCUE} \ + ${LIBNVPAIR} +CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs} +CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs} +CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} .else # liblzma needs pthread CRUNCH_LIBS+= -lpthread @@ -235,6 +245,8 @@ CRUNCH_ALIAS_chown= chgrp CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig +CRUNCH_LIBS_ifconfig+= ${LIBNV} + CRUNCH_LIBS+= -lm .if ${MK_ISCSI} != "no"