From nobody Sat Oct 26 18:12:03 2024 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 4XbSR75HnWz5b22g; Sat, 26 Oct 2024 18:12:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbSR74s6xz4n50; Sat, 26 Oct 2024 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966323; 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=2ZW+AHpptHrevJsq5WiwNU2VvLuVJLzmlTA9jNeVtC8=; b=skCYwhdp1vLmqVfAJpg8PuqD0sKWn6inzHtxgY33jsL+HyXbfQB5i637EZJmu1ABbU4Jsi kerN7i8y+iMtU7RcF/JzOAtmU8n9c+g1aFQ4hd+cdPNaUBbdpOReW3XDJGfnXjDrLOnU8d NlHPlNSukGdVyT8mGwEh93UhVyWxKJmOfdzOCOwG9Mm0+29z0+tA7vmNgWim5r8WxgIKfk oubTUQMitegMoLQKDX6JYy7o06Lj3IxY0XiLj0pR315Tkf/H/ve+NYCiqDmMZp+LJT6e+s kjve18GTgXopgeKeKy4GDatiwYHQusBJHMlre1zWyqIgXv3DmVMersN2AVDszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966323; 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=2ZW+AHpptHrevJsq5WiwNU2VvLuVJLzmlTA9jNeVtC8=; b=J/6utsRxfpWpU0TPXW0Sh9yDvKL8kOPe15ItED6d8NHMPK/hHGyJ0HYqBKe1EqWyqg1M2Z n3dHeyEiHFOYPm6cauA8dRzGlKOPxHuSRGrErdFy5t11lR9Dtdh5dBuzpsrUDsJmx5pXja IxN5XMBc77Twbl+WkUtzLVA0g+SGapJTvssayaBWeOnVj6/qjmgq2OBdxdQamIUd6rSTgQ D4PrvQOyoyjn1CvgkHHvUuJFIsBeMHuL4LrPYAFf9O4kOEuZ/j//OS82KQS89P0YKIlb4p DP97nthsoMukD6+moiTfPW07DM7kOobaXXdD9F9qTPfN62A2fVzGFPY9FGGeSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729966323; a=rsa-sha256; cv=none; b=Act1vh5O1VrxT3mMHjKgVhOBZFrZMH3hW3U0oJ8TNIokWCs+snvbrMDHgo1+SM/M7LQuEU 7Ym+41jTPfml1og/V+Z8qnju/1YdiQj1STUX8bWpruHh8QTu168lCv+oM+NZ0DRK20rkCv znFmACUzWhTSAtCMu0RMgqlQwKXfF1X2DyBPTCVOn8vVAmxXtnTsuBIjrS+7wEmhbmiWiQ G2r/YUbl/Ci/lqIgvNQ39kkGHKdFigYmH+ze2LQbXtYrp8RTStH/0rQOdtrjuKaH04vjTu cENT/A9xVgTQP4+n1PRcFGHbFFiK7KCp8eAsMc3IsAjFcLyWDx4QzcJ9K1zjmA== 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 4XbSR74SWRzL1g; Sat, 26 Oct 2024 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QIC3PQ047772; Sat, 26 Oct 2024 18:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QIC3hj047769; Sat, 26 Oct 2024 18:12:03 GMT (envelope-from git) Date: Sat, 26 Oct 2024 18:12:03 GMT Message-Id: <202410261812.49QIC3hj047769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 87c2aab0a0b3 - main - lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 commit 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 Author: Robert Clausecker AuthorDate: 2024-10-26 14:16:10 +0000 Commit: Robert Clausecker CommitDate: 2024-10-26 18:11:02 +0000 lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 This is apparently needed for the cross-build from Linux to succeed. Fixes: cb5e41b160838880de7d03100afa02e4edee5a9e --- lib/libcrypt/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 5a9eac4c682f..e939bae1bc25 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,6 +1,3 @@ -# -# - SHLIBDIR?= /lib .include @@ -18,7 +15,8 @@ SRCS= crypt.c misc.c \ MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \ crypt.3 crypt_set_format.3 -CFLAGS+= -I${SRCTOP}/lib/libmd +CFLAGS+= -I${SRCTOP}/lib/libmd \ + -I${SRCTOP}/sys/crypto/sha2 # Pull in the strong crypto, if it is present. .if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"