From nobody Mon Mar 27 21:28:09 2023 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 4PlmBf01f3z425mm; Mon, 27 Mar 2023 21:28:10 +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 4PlmBd6fFfz3lr9; Mon, 27 Mar 2023 21:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679952489; 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=2P10X0f8QJ7RcAssCT0fg5iY9tni11vs+jyVHaGSnh8=; b=WSmg+hYmqYqaoDkmzoZY+KKggl2LUBEO7xOuDn4GRiav4PvgbtQ4ftfyUXBjOs5neA/4he 7cMEILH7gGWbfkpqAPK+//cmqs5lMjuyF2BqS3OviUJxVPOjIOjtmn/+H4JqAzC4fzHMKS lqzeYRL7vvGxlp5/bGmM5Nu3EDUCoMMyAJCyUaijlAsvSTNt1HzQKyBWzEyhnhjk9+5+mk Xr+sFV4VXgTCmPM1k+rJBy88vzN4jqrIChUdCkOR4n0xxKfMBSj7BlZmRQFDrz1k5wS/RP zCQ3Io6nuFvdKAGaZlS1yLEKhX0V5GpcMD2BbtVo7GzAG6qthBmkwb80rGlTng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679952489; 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=2P10X0f8QJ7RcAssCT0fg5iY9tni11vs+jyVHaGSnh8=; b=GkOx2VjkBu+8zTxrR0woUNtya77IWh3aP4aaMcYwzLAZnmkpHyeJ68aC9U/+O4yqRURU04 6YUCW+qRoYi+lPtOQik8RF0GjEVG/QVluSTfMtCRxYan+d8xsMXVFVo8AE/DGO+lIDvXMZ gHGn6RsXuEGrMHN2s+M7c0QMiigbLlFnLWyXdIPKTDyvbWO+Yj5QWEbuuG53ymCCSxeWjW RDSOaD8c8pu+pUvB2bA6mEgD+KWbiBrIMqSvAnAkXEvNIPFQV0/dRhmFehElgnYFPQADtq rvaw7SboqHUy5MGLPYqaICB6jYpxrfrUNZMvLBq1il1bXYYt/RIexx3wtxtIXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679952489; a=rsa-sha256; cv=none; b=EoPnE+YJvbT1bXxxPl/TRfdP8veGHmyJ5ehFr9Ye43aRLAVPhuNItrWCJranK+GOAeDwJs xF/F+zuLTSa3HWNoSl3E2JI9Xtvm7f+sVaQ3xEePMgXJEGjZW097nJESkdWcEnvWP4phQz 96wpROi2aSSwgjSzqo6gj+IV/p80smYIsDoXFQRgzk38yg9Ks0LHwkC+iwCfGWBNCqnV3v xiKAvC5JEA96cYaFAvLNDqH56vaVZonsqBBrVo4kzaCsa2kO8SqZbXtpfphqLQeEUVpvap FnHF2fMp1ou212pnfJS0xZyziNI3q5+TuAhKwo0lc2PN4dnf6t11znkeXVfMyA== 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 4PlmBd5hd0zdbW; Mon, 27 Mar 2023 21:28:09 +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 32RLS9P9050253; Mon, 27 Mar 2023 21:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RLS9E1050252; Mon, 27 Mar 2023 21:28:09 GMT (envelope-from git) Date: Mon, 27 Mar 2023 21:28:09 GMT Message-Id: <202303272128.32RLS9E1050252@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: ac6b2b4344cd - main - build: glibc on Linux defines explicit_bzero in . 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: ac6b2b4344cd586847fe4318c776e1213b09e6de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6b2b4344cd586847fe4318c776e1213b09e6de commit ac6b2b4344cd586847fe4318c776e1213b09e6de Author: John Baldwin AuthorDate: 2023-03-27 21:27:16 +0000 Commit: John Baldwin CommitDate: 2023-03-27 21:27:16 +0000 build: glibc on Linux defines explicit_bzero in . Don't install strings.h on such systems. The local prototype doesn't match the native Linux one when built as C++ breaking the build of config(8) as a bootstrap tool on some Linux systems. If the missing prototype becomes a problem in the future, tools/build/cross-build/include/linux/strings.h can be patched to add it. Reviewed by: imp, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D39289 --- tools/build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index c7875622b042..71a38534f7ac 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -78,7 +78,7 @@ SYSINCS+= stat.h SRCS+= futimens.c utimensat.c .endif -_WITH_EXPLICIT_BZERO!= grep -c explicit_bzero ${HOST_INCLUDE_ROOT}/strings.h || true +_WITH_EXPLICIT_BZERO!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c explicit_bzero || true .if ${_WITH_EXPLICIT_BZERO} == 0 # .PATH: ${SRCTOP}/sys/libkern # Adding sys/libkern to .PATH breaks building the cross-build compat library