From nobody Thu Nov 19 22:22:21 2026 X-Original-To: dev-commits-src-all@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 4jVtJC34Cmz71Qk4 for ; Thu, 19 Nov 2026 22:22:35 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVtJB5K6Bz3PL3 for ; Thu, 19 Nov 2026 22:22:34 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4a2d6d01ecbso1374295e9.0 for ; Thu, 19 Nov 2026 14:22:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795126953; x=1795731753; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:content-type:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=yLtBktKZk8gsbn/pY8nYNjJHL2/jaNgTs696c/+F3gU=; b=M5XRzaqmlH9x6hW2kfViO94IBCYjzKJ21je6L7ktJeLdNH00Nne1Oht1QhJLnx5Okt rFfMCt9zfQ+DMcOr+Gq58ydE5bSmUq8h1HkBTgJ/RVA8c02cZhmIryFTVP2F6KmcuQt+ uno9PxgSDDr9GznmAfyi+t/TZTuH/jrgePa4Zykr2N/pgA702WyQnMNQXVKSke3MsbXd q7T/5JX3gTVoL8cQP6qWTG1adJcbY6iROJ0jlO3OMi77VcxRpyIVTu8/5btbHEZmZyOK hnWemNBVnFdMRwzyMZkL+T899/slW1mKU1Nmz521P8pHkK8/oC2Vz27pyt2zDoMKfmoB rdmg== X-Forwarded-Encrypted: i=1; AL+hErFhKbxpYoR7xcQMgRJlLjCzanxljuIwhV29q3WPfDZpvkjIKCnzmHFP15pMa7lH4s2vaVN5s4JgX4CzyIXRimrlpcLx@freebsd.org X-Gm-Message-State: APuU4Z9IzcAEUC6JgDfVl2liZedEtdPgxdP0cZSHP0vHUkbUPwUy2Gp0 5CLYHeIO2uBOTQPJxf/qCik55Hv80K9tLYWV0/5mAulLWBe/yXTuxb1lcSeJ8Hg9hSk= X-Gm-Gg: AYBFou2zK6mUbL9dwAZeKZE4WW0iWVxPmtz51AcA0YWLjn3ptZ8jWtfYheB8YuN0Iw4 VXTzuHrRk9gndtUS9vppzw6ZLQwxdu4mvRXRnl8cx15ZszWXdUOoCzvDGqQNG4nTUFanFNuAlB/ 9ReGv/KNWVb6knJH15Fqdy30T9t5CYO/A7jFdZEgGXXDyCuZdT4VyZI5lJnKD4f2DKuPiYy4ZvI woCz6qrLkBy6KWvcCsYYXBZjCorlz5BOXNTsk1HfqBX1KSNFIaVou8QKFbeDojsQUhl19K7DP3z HuXpq2bNNDkBkY9XMxPuofjnc3jJ1dii/oCyw6OtaEUpqIGG2I57VX1bOaqVECc+aY6HI/SBCch 2xLnMXS6QP6/7uaPI44ZiDOayOge6jbVt2JtOCWnlqIcgSVGxqYPVjSdq/hsu3AGcun8TL1FQ/J u/NLl0rSvMdSMjyQfebWF9j0db7PmkBsC6ZaMaRPFq/YsRae8SQKIOXgwKdN2ANpGXVwiIpClu1 QeKOkonVxM4HOyFxFXqlUfK6702KZKSphrXc3yT33vQOBCY9OJpRGP8aFLrOOh6nALvcH91Sg7n kWzXr+LdYT/cykiY1b+qVaNHmtUwc2MgoCNjxFIO5cp5108veeirHN1QN78hIKwskOKt8gEON/m Y X-Received: by 2002:a05:600c:8b83:b0:4a3:59c9:a747 with SMTP id 5b1f17b1804b1-4bb8880642cmr21487465e9.17.1795126952706; Thu, 19 Nov 2026 14:22:32 -0800 (PST) Received: from smtpclient.apple (nat-184-161.net.cam.ac.uk. [131.111.184.161]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb853a9846sm74811965e9.11.2026.11.19.14.22.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Nov 2026 14:22:32 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3901.200.71.1.16\)) Subject: Re: git: 8b197806dcdf - main - libsysdecode: Teach mktables to handle enums From: Jessica Clarke In-Reply-To: <92F04590-94A9-4FD8-B288-536C0F6D4126@freebsd.org> Date: Thu, 19 Nov 2026 22:22:21 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , FreeBSD Release Engineering Team Content-Transfer-Encoding: quoted-printable Message-Id: <66090801-7FFE-4ACF-87AD-4C503429230E@freebsd.org> References: <6a4c058d.3ff3a.44bb1175@gitrepo.freebsd.org> <1EE0178B-840A-448B-A666-A95A45139CC9@freebsd.org> <92F04590-94A9-4FD8-B288-536C0F6D4126@freebsd.org> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3901.200.71.1.16) X-Rspamd-Queue-Id: 4jVtJB5K6Bz3PL3 X-Spamd-Bar: / X-Spamd-Result: default: False [0.60 / 15.00]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; TO_DN_EQ_ADDR_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.45:from]; R_DKIM_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.45:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5] On 19 Nov 2026, at 21:39, Jessica Clarke wrote: > On 19 Nov 2026, at 21:12, Jessica Clarke wrote: >> On 6 Jul 2026, at 20:44, Dag-Erling Sm=C3=B8rgrav = wrote: >>>=20 >>> The branch main has been updated by des: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8b197806dcdff5673dd4f77a97bf4603= 5d14db2a >>>=20 >>> commit 8b197806dcdff5673dd4f77a97bf46035d14db2a >>> Author: Dag-Erling Sm=C3=B8rgrav >>> AuthorDate: 2026-07-06 19:41:15 +0000 >>> Commit: Dag-Erling Sm=C3=B8rgrav >>> CommitDate: 2026-07-06 19:41:15 +0000 >>>=20 >>> libsysdecode: Teach mktables to handle enums >>>=20 >>> While here, clean up and simplify the existing code. >>=20 >> This has completely broken mktables on macOS*. Please back it out >> immediately, MFC it and get that into 15.2 so we can go back to a >> known-good state and have time to properly diagnose and fix it. >=20 > The cause is that \> is not POSIX, nor is it a universal extension. >=20 > GNU sed supports \> and \b > FreeBSD sed supports [[:>:]] and \> > macOS sed supports [[:>:]] >=20 > Note that, although we bootstrap FreeBSD sed, it still behaves like > macOS sed, because it uses the system=E2=80=99s regex(3). >=20 > I have no immediate solution I would feel comfortable deploying this > close to 15.2=E2=80=99s release, so still believe a revert with a = later re-land > is the right course of action. The more adventurous alternative would be something like: diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index bb784c853e48..61dc089a42c4 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -64,7 +64,7 @@ _EOF_ sed -nE ${excl:+-e "/${excl}/d"} \ -e "/^#[[:space:]]*define[[:space:]]+${grep}/p" \ "${include_dir}/${file}" | \ - sed -Ee = 's/.*define[[:space:]]+([^[:space:]]+)\>.*/TABLE_ENTRY(\1)/' + sed -Ee = 's/.*define[[:space:]]+([_[:alpha:]][_[:alnum:]]*).*/TABLE_ENTRY(\1)/' fi cat <<_EOF_ TABLE_END @@ -95,7 +95,7 @@ _EOF_ awk '/^(typedef[[:space:]]*)?enum([[:space:]].*)?\{/, /^\}([[:space:]].*)?;/' | # pick out the constants we want - sed -Ene = 's/^[[:space:]]*('"${grep}"')\>.*/TABLE_ENTRY(\1)/p' + sed -Ene = 's/^[[:space:]]*('"${grep}"')([^_[:alnum:]].*|$)/TABLE_ENTRY(\1)/p' fi cat <<_EOF_ TABLE_END Tested only that the build produces a plausible tables.h on macOS, but I believe that in theory it only uses standard POSIX ERE features. Jessica