From nobody Tue Jan 25 01:40:12 2022 X-Original-To: dev-commits-src-branches@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 B220B1973280; Tue, 25 Jan 2022 01:40:16 +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 4JjV0Z3S1jz4Zst; Tue, 25 Jan 2022 01:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074814; 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=A4crgsYroBx23ixCVMj1jRkZrH1Ysh7Q4gdNVBO1UoU=; b=EJPK/cvuGBklB6gNSZwTUS7pxYPbZiEC7J5hOovAZ4CtRiNBxjI6bPleFSYiC+2T5UxdgC fjYlha10d95H2dvtLh0HNjaakCoVG6W34ptDg6TbiF0oboH4EdNVfBOsgd0KnLrq/NeHUc WR3H+G4k/6uiPSAsGbcqJoikZSwTKibKnSH7W2qdYn4HMb+QSO1asNpj+NLHCirQRxqAbn yOODJRJi/7xwR8F8nAsK+W0fBcpqkstJ9kdecBydbcth9q1zOsRjV+bIC8QapP7IxVBzy6 8x2ljK6wXykj/EwowgFsv1fBHMuqR1xxWeBGIzEXLuR7wjsuVwQkJnuNxaTRPg== 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 C44872086D; Tue, 25 Jan 2022 01:40:12 +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 20P1eC1A047250; Tue, 25 Jan 2022 01:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1eCEi047244; Tue, 25 Jan 2022 01:40:12 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:12 GMT Message-Id: <202201250140.20P1eCEi047244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: e8a6686252b4 - stable/13 - cross-build: Fix bmake bootstrap with glibc 2.34 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8a6686252b4eecea4565d6013b8cfb844a9a603 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074814; 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=A4crgsYroBx23ixCVMj1jRkZrH1Ysh7Q4gdNVBO1UoU=; b=MSFH2T3FjpA6ZaLkD2qpcUbBbTC3Z1ZIb2p+x8mnIngUcKBLi558KnK4NEZrSqYWShX5Vg 3p0FkILtzIpQUv8aUODqXoi3yCp8/60jifD97H2/DZ2RFNXSqPGslUQid7siuGLaQOA+Zh +AJyQCR7l3WiMClGAH0fiEV/TNK5WmGB9wtSd6dG6SgI8Zu9GRnXDBE1TQe9NEBerx9ywf NKUAOiMGBQ+JqDvf427usT72HA3dSB5aIj65pIE8XaqOgRP5881qCDZZJrzTCCScL1hvZz PCUXGXhFdC6/WYxrswBdDpS2Xd8o1vaV+NencI21qqkKM1wWwsRm5hdaI8M9UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074814; a=rsa-sha256; cv=none; b=pB5kZIJ0s90lk/pXuq/AqyCxc3cCvB2pZA4FX0kG2d4PYVhqLYUrBr2zQxcysc8PU4uNNz E6sRubCXpipnQfSW6Pt+yFthnRiHLEb/Sw5E/6s4/Wo3PD404cKfJzVcfdXN0I44sw8hnX CJ/07eeHEJTUZV71zrjBU3+T3vXzdfmhNEWniOnkgz0DtRDqoEzvm568r04Lbvds8fB4CL ScdEE+P+mnISjZ4SdtrBpUulnX1iiAPKINFw/FPFENGvpqscmH+s4D0kM1O8TKsv3NVKaA gZAQTlNlElgH8U0jmDv1rJcl26XJPk296N8ssVX9d5OKzavuJ3sSukNQIPQj7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a6686252b4eecea4565d6013b8cfb844a9a603 commit e8a6686252b4eecea4565d6013b8cfb844a9a603 Author: Jessica Clarke AuthorDate: 2021-12-15 05:52:13 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:42 +0000 cross-build: Fix bmake bootstrap with glibc 2.34 As of glibc 2.34, our unistd.h wrapper's inclusion of stdlib.h exposes fragility in glibc's sys/wait.h and corresponding part of stdlib.h, leading to "error: use of undeclared identifier 'WNOHANG'" and similar errors when bootstrapping bmake. Work around this by wrapping sys/wait.h to force stdlib.h's inclusion first before it's implicitly included during the problematic window in sys/wait.h. MFC after: 1 week (cherry picked from commit 9e5b0d9eac5b240dc0ee280870291fd11d499046) --- tools/build/cross-build/include/linux/sys/wait.h | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/build/cross-build/include/linux/sys/wait.h b/tools/build/cross-build/include/linux/sys/wait.h new file mode 100644 index 000000000000..2721218a83d4 --- /dev/null +++ b/tools/build/cross-build/include/linux/sys/wait.h @@ -0,0 +1,31 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2021 Jessica Clarke + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#pragma once + +#include +#include_next