From nobody Sun Jan 29 23:53: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 4P4p6F2tFlz3bMl1; Sun, 29 Jan 2023 23:53:09 +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 4P4p6F2PzCz43Rf; Sun, 29 Jan 2023 23:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036389; 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=lP92aD4xxd78u/bdsaiHlL0msMLGtWc0neOTZiSurb0=; b=PajS3pb2//bTE3hmToTGcXfdO4f3gGLUA4xdcrPSMAEaVelXAVFO6NHgoVOsVz1yqSCWrR QHfLVxa9IilC9JaP7AJcRZPrravo9VdAvwCVSmFf7X9ZJUI/MqkBH9IxpP7FUlDVkioajv a6gxDqU3dRrHMA3lk7hURZHnrkADzcg1S2/kJiheul9PLkWrDbt2pVZY04JPsTyYZ18ZEN CQ6jn1g6944BgajRQgO39iHuDKudkzDQ6tIsTRGD94NxSyrcD5GSVXAoqCjQOSSiFNEdky dNawTZ5RFL72q4DJc5Z6KoeVn7GGwL495ZWcN+PXe3Se4YrNSbdDEdOid20t5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036389; 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=lP92aD4xxd78u/bdsaiHlL0msMLGtWc0neOTZiSurb0=; b=ELkkQtc1PrFUPN8sJQ/xrLIV9ZFuU7cJWymw7ndkHuifKuACPj0P4i0vycRiatNx2PPy3X 1Au93nA3zaBM3zlJS52gGcKgn/mnPK/Ph+tOULbFH+d/sjZJx/Cfl4dtYw/ONdf1qAf552 MKyDPVxkasfK91bzxKEhiDj1vd03ByKJnHh1RHX/tHcM9F84WZrxb0P/EaokcCy+Jybqxy 1nSFviPhDNqtaP8C0SP1BSvrD6DaOIcH1lUnW85E27PitjWmqS60JNamLrjBjwYTOz6CqS VA8vXB1LlNC1Shq8KpbhHvcKMmQidK8YieXHT6FCddnSY05Qnos1uTzoSvyGqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675036389; a=rsa-sha256; cv=none; b=EDGa0xET7bpb6XssXJoY8SB495NXH++OXboOXqKbRMtQiuGbu+9wUbR1zBaYO8BVD0zOHY 2wobWJCP6cM4kWmZlZq+L74aBUw/Tu/sics/F8PNntESW3DnX0A2GsRzM2QI/ji4Fu1JMO dhtO0qs/siTsE6DaktPQzjYgWI+jCEvTCcoMbK7a5uXW+eV8DkTHRO2CxUpuxOh+pSA+z6 GyCY/Quj/1Bol6Sj6b3a96/6vRwRP6P2CaFf1vJtiP2rVcVhwDrua1Ma1WzGRA4jV42SGE MgxbUlax0Wvne6L85NX9ESFsXPkvOWJnQ6XykLAwUr9D3qtZ3hxitnrKZHoEpg== 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 4P4p6F1TGSznQs; Sun, 29 Jan 2023 23:53: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 30TNr9fR020430; Sun, 29 Jan 2023 23:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TNr9i5020429; Sun, 29 Jan 2023 23:53:09 GMT (envelope-from git) Date: Sun, 29 Jan 2023 23:53:09 GMT Message-Id: <202301292353.30TNr9i5020429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 35921bba736a - main - tools/build/make.py: Drop problematic Linux hack for bmake bootstrap 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35921bba736a017061c1e3d7b6f3e9c5a4726cda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=35921bba736a017061c1e3d7b6f3e9c5a4726cda commit 35921bba736a017061c1e3d7b6f3e9c5a4726cda Author: Jessica Clarke AuthorDate: 2023-01-29 23:07:25 +0000 Commit: Jessica Clarke CommitDate: 2023-01-29 23:53:04 +0000 tools/build/make.py: Drop problematic Linux hack for bmake bootstrap Since e2eeea75eb8b ("Merge bmake-20201117") missing/sys/cdefs.h has been present in bmake, and _GNU_SOURCE seems to have been defined by config.h for much longer than that, possibly for the entire time OS cross-build support has been in-tree, so these are obsolete. Moreover, since 79e02149fcb4 ("Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import"), HAVE_STRLCAT and HAVE_STRLCPY have been defined by our cross-build headers in order to placate DTrace tools (which is not the right way to solve that problem, but motivates fixing this one). Commit 4fde40d9b540 ("Merge/update to bmake-20230126") changed the strlcpy.c in bmake from including config.h directly to including make.h, which means it includes string.h and thus sees these bogus definitions, causing it to not define the strlcpy compat function on Linux even though it needs to and thus failing to link. Thus, fix this whole mess by removing the hack we no longer need. --- tools/build/make.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/build/make.py b/tools/build/make.py index cede0c99e316..4260a9e88969 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -71,12 +71,6 @@ def bootstrap_bmake(source_root, objdir_prefix): global new_env_vars env.update(new_env_vars) - if sys.platform.startswith("linux"): - # Work around the deleted file bmake/missing/sys/cdefs.h - # TODO: bmake should keep the compat sys/cdefs.h - env["CFLAGS"] = "-I{src}/tools/build/cross-build/include/common " \ - "-I{src}/tools/build/cross-build/include/linux " \ - "-D_GNU_SOURCE=1".format(src=source_root) configure_args = [ "--with-default-sys-path=" + str(bmake_install_dir / "share/mk"), "--with-machine=amd64", # TODO? "--with-machine-arch=amd64",