From nobody Wed Nov 15 22:13:45 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 4SVy9y6sbTz50p8Q for ; Wed, 15 Nov 2023 22:13:58 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVy9y25LGz3GxG for ; Wed, 15 Nov 2023 22:13:58 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4084e49a5e5so963965e9.3 for ; Wed, 15 Nov 2023 14:13:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700086437; x=1700691237; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vKNycPreq/lMit01zZ62+fw2eFvnZ0nTCmD2Q7/g2aY=; b=oo/ztm3bfEV0H7zwg1t5vH+W/x3lv0JEnmgYQwJ3ZlAzg6e4a/gzAopz960s001lRC mgLHi+u5GP55g1dVnnvzvSHPy3UBEFZJoeEUDt2K6BcT80NfSkq3Ypy4M59iDd5XeTSe RZQVtMka20sEfMFmbkVt/PXijU9iPvR6jc3QoBwAAzq2UwrSwodjy+Q+OYbvqhlfTtre 7s5paHpx9OcMjGyDaePE0qS5FQRJ0NPQKceP3R+djWBpCYXfkKoh4rH1FTZ5c9KIkb8u Y2ZDQRpYBtJEsp7nEKjGhRxW1lr7MsurnI3tSngjFlO7jMcNC/Fi2sZv7ssrTlxFhauQ Lb9A== X-Gm-Message-State: AOJu0YwDKNdexLsUS6Q9J/pkv6u0JmTzOmsJaZxTimTaTXiFEoWWnqJv xuLdzqxyt3Qoi3tv6BBQmc5tHNz2FZuY2IkkSq45ow== X-Google-Smtp-Source: AGHT+IF06TnZpufnQuK5Uq0kqSdpJ6UdaOyeJ8ERppTfOnALTSEqDj+q6bvKUAhA8Ds/wTXOWlwbPw== X-Received: by 2002:adf:e110:0:b0:32f:889a:2b9f with SMTP id t16-20020adfe110000000b0032f889a2b9fmr9929321wrz.15.1700086436456; Wed, 15 Nov 2023 14:13:56 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id p15-20020a056000018f00b0032d96dd703bsm11714218wrx.70.2023.11.15.14.13.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Nov 2023 14:13:56 -0800 (PST) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 3fd60a6b73ac - main - awk: Merge upstream 2nd Edition Awk Book From: Jessica Clarke In-Reply-To: Date: Wed, 15 Nov 2023 22:13:45 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202311140451.3AE4p5AR014207@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4SVy9y25LGz3GxG On 15 Nov 2023, at 21:59, Warner Losh wrote: >=20 >=20 >=20 > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke = wrote: >> On 14 Nov 2023, at 04:51, Warner Losh wrote: >> >=20 >> > The branch main has been updated by imp: >> >=20 >> > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970f= ae4cae73 >> >=20 >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73 >> > Merge: 194df014feeb 2e406c584fe4 >> > Author: Warner Losh >> > AuthorDate: 2023-11-02 16:32:01 +0000 >> > Commit: Warner Losh >> > CommitDate: 2023-11-14 04:49:34 +0000 >> >=20 >> > awk: Merge upstream 2nd Edition Awk Book >> >=20 >> > Merge in the November 2nd, 2023 version of one true awk. >> >=20 >> > This brings in Unicode support, CSV support and a number of bug = fixes. >> >=20 >> > Sponsored by: Netflix >> > Reviewed by: delphij >> > Differential Revision: https://reviews.freebsd.org/D42447 >>=20 >> This seems to have broken the GitHub CI for cross-building; contrast: >>=20 >> https://github.com/freebsd/freebsd-src/actions/runs/6859373313 >>=20 >> with: >>=20 >> https://github.com/freebsd/freebsd-src/actions/runs/6859316228 >>=20 >> Has this broken makeobjops.awk somehow? If so it should be = reproducible >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an = updated >> system. Cross-building will just show it first because we always >> bootstrap awk there, like many other tools. >=20 > It worked when it was the system awk for me... But that might not be = the most > helpful observation. For a clean kernel build? > Why didn't it work for you/github's ci runs? =46rom GitHub (indentation sadly lost when copying): > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam.c:45:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam_ccb.h:1052:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/mmc/mmc_bus.h:4:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/dev/mmc/bridge.h:57:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/sys/bus.h:787:=20 > ./bus_if.h:217:35: error: expected ')'=20 > int _unit);=20 > ^=20 > ./bus_if.h:216:33: note: to match this '('=20 > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const = char *_name=20 > ^=20 > ./bus_if.h:241:41: error: expected ')'=20 > const char *_name, int _unit)=20 > ^=20 > ./bus_if.h:240:39: note: to match this '('=20 > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order=20 > ^ > ... Hence the assumption that makeobjops.awk has stopped working properly, which is highly consistent with this being the first commit to fail in CI. It looks like we=E2=80=99re missing commas, maybe from format_line. I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s = across all macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t. > makeobjops.awk doesn't have any of the issues that I know are minor = changes > in awk. I'll add it to the list of things to look into, though. On what timeline? If not soon, can we please revert the import as it=E2=80= =99s breaking important things and thus not ready for the tree? Jess > I also broke the Jenkins CI run, but not 'make check' for reasons I = don't > understand. >=20 > Warner