From nobody Fri Feb 11 22:00:02 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 9CCE019AF917; Fri, 11 Feb 2022 22:00:02 +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 4JwSGB3lZ4z3tfl; Fri, 11 Feb 2022 22:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644616802; 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=Ccam9euEIpvCoPjKc3EttcayCjXz1CV190LFd0YHdCw=; b=nBarSyrFNEbooveaG09LTSTjL/iZ2tPoVM1yvABsq/D3SKmHmY115z55otRxRwbMugnhsw HQokvl99tG5N71IDqATvMymQh+Hr6RbT0SvaAdLFNELjf6th3rkwrZp+hwmJfXCR+LQtq5 L8IjoZ+j0QsiZnEzd+atr4YWlIaL5bNaUPtcIvHXqsipBbz+U1RamjgdIexqITVcARqn+8 kOZ6DZNjI5Q/UgVh4JaYfU1Oiu93OD0RszwIsBj8wcutPa5dzLtOILIBfhdIocboxCoJQJ Jo19e89+OCaT0pozwQuV1IzRGkwNaQZiB+Vce9Di9q1Hs2b3Ed1r3w8dRyO7Wg== 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 610D01BA74; Fri, 11 Feb 2022 22:00:02 +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 21BM02CH037473; Fri, 11 Feb 2022 22:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BM02mA037470; Fri, 11 Feb 2022 22:00:02 GMT (envelope-from git) Date: Fri, 11 Feb 2022 22:00:02 GMT Message-Id: <202202112200.21BM02mA037470@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: 13916064fc39 - main - rescue: Link with -lncursesw instead of -lncursesw_real. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13916064fc393757635cc8a45f780790266e8a91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644616802; 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=Ccam9euEIpvCoPjKc3EttcayCjXz1CV190LFd0YHdCw=; b=pa2Nw8YTDOB+FUaubBJxzbHYi8TrU/KDTQNIOpJpgj7sSgsW/0GCeDXEjZi9H2AzLjWgkY lfHQ7b4IO4PQk3gc4RA0gZ8u2XyPu6kXsKo0PsFe5Ag0MZ2pFLezETXTas2a/5EmqhEbvh TlIccrr2uHX5w2kt0jMS627DinhCQsaFaKYv7fU7fZObm3F0YBedywT162ROCJng7oVSPr 2IWfiP39yBx+ACTQOqQUqtkFV/qB2UOekPBCzBrFExqLqoSVMiq45xrvpgRr+0ZGSRJx0+ F2PutRvapJ/srbUA3tHDaFCKRetxWVMdFPYXHavYFrgERLM2xfzPUZtGmC0TSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644616802; a=rsa-sha256; cv=none; b=aEwtvJA6F8NLSqkcwZ3RLFh7w7qU/SLkM+sfI9xiQCfhEikzNUOqHuv6SbyupgIADU4Nm2 EeMqFuij2H+Rehpcpwih4YjMtBGuZRP6KaNIp5w98zI9ZJgStHeJeonQ3t4t+BrSx6rDJK PNQS0KGgZ12Lzwg9amCS+cdt0OQ6JU6oWCKPI7r94ZPVMauOcTYE1KeInTyWeJLSTuL3q0 PwHNRWxZIsZ/fwfmctllm4ELDB3MUALg7JaWmUc4d8ICHflUlrfVV46n/7AnaKJrZ32iVC amLF3NPlMv5sjCRv6Y3Nc8eDHFSwI7uen8MyM5+tTp9Q5c+wIpT5C4HSfLieVw== 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=13916064fc393757635cc8a45f780790266e8a91 commit 13916064fc393757635cc8a45f780790266e8a91 Author: John Baldwin AuthorDate: 2022-02-11 21:58:59 +0000 Commit: John Baldwin CommitDate: 2022-02-11 21:58:59 +0000 rescue: Link with -lncursesw instead of -lncursesw_real. ld.bfd fails to link rescue with undefined symbol errors otherwise. This reverts commit b158d4d7a12fad8e9c4509466d5f1ebd15862d9f. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D34123 --- rescue/rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 938712371061..216656be36a9 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -135,7 +135,7 @@ CRUNCH_PROGS_usr.sbin+= zdb # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd -CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw_real -ldevstat -lipsec -llzma +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