From owner-dev-commits-src-branches@freebsd.org Sat Jul 31 19:31:53 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65C60662FFD for ; Sat, 31 Jul 2021 19:31:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GcZCF1WFLz4tyM for ; Sat, 31 Jul 2021 19:31:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82e.google.com with SMTP id h27so8941260qtu.9 for ; Sat, 31 Jul 2021 12:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xEP1g0PublskGl+FMV1aIVA4/AT0BW0l/VYSZV+SkUk=; b=Tj/hUru4ayg+8FsbjrkmG2mfn4uDQiWj5UMJxVkL4CXRidXzQyHccBTy4xiWjzG6yT zvvB3XaV937nYRaBbNwmAhUDVkUz5eDLWDNIwBxXQ05huEp9o2LmCPNxYuOtQXCadeFd r+aKuUdp1I72evkNpfyBkS8BZTOfLGkGSZxgqBW9+9v95nzWDTenVhtNNfFFQt+pkQRF yU5i8UHGySrFi/wGHJ9O+vpj90v+bEXOKk/D/7u28RLXf7srwPdLr/EsOARP9mfBEsPn 9rI3YlPPdJPS91RLpAukuFZltRamM3P2Gvu355pbSd8yOvFB2x/seiz2cyJvfLSF2NO0 YClg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xEP1g0PublskGl+FMV1aIVA4/AT0BW0l/VYSZV+SkUk=; b=mni2EVqEtfQ7fvrYzWyDO+81T80fOwN20p/j4E00wP/5acTRXEy7OBX/Bx9bN7nmYN yWOf+WeePEpZBcvPzan5GEgV+EXiOkO1N7hUPkLvevrOF0/7GJUH4nbKrJXXVdHY7ekw BX8Dl3Yy8ldyL6flVE7a0VMnWWKR1hPUzepdy9JD6Hp9A++FrxI3+DLwSLpKDdRQAMYO +ziCxOL9Yq6sW568FccIXTHzu6gk2CWGRo/DJE8pc0+hi1AnTmPIg5fNjVM5BxjeXBNr qo8Bb8+9xBm75N2d4Or9Kn5FA6mTeHVFnO2S7eQDkyX6Cbrzfpq8Qt56oj5QbbsBVTm4 5TFA== X-Gm-Message-State: AOAM531+dIvmLAqYKmn7YM67eFzKLiECZgOy8rMo1h8K7bqiNYkcbCdB nCXKAgRkkM7DyQKcvmsizr3XR2/A+FLf7LgWLMd28w== X-Google-Smtp-Source: ABdhPJzNNxpZis6KqSPGbsqbXs/3A8IxOplwTJsK+obXxQNdaCaUd5WCrKBoxdGFKVjYAEC3kc4D1713AEED+xcyRwo= X-Received: by 2002:ac8:734a:: with SMTP id q10mr7719576qtp.73.1627759912705; Sat, 31 Jul 2021 12:31:52 -0700 (PDT) MIME-Version: 1.0 References: <202107101712.16AHCwoE088447@gitrepo.freebsd.org> <4AD3AB8C-A960-43BE-A89B-5D9C4CD077DD@FreeBSD.org> <8300183E-DD11-4C2F-AE5A-0B6FDE6E9E8F@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Sat, 31 Jul 2021 13:31:41 -0600 Message-ID: Subject: Re: git: 6edf5082bab7 - stable/12 - one-true-awk: import 20210221 (1e4bc42c53a1) which fixes a number of bugs To: Kristof Provost Cc: Warner Losh , src-committers , "" , dev-commits-src-branches@freebsd.org Content-Type: multipart/mixed; boundary="00000000000060b43f05c87063d3" X-Rspamd-Queue-Id: 4GcZCF1WFLz4tyM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 19:31:53 -0000 --00000000000060b43f05c87063d3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hmmm, maketab keeps getting rebuilt, which is the issue. It looks like it has extra depends that don't trip up -current but do trip up stable/12. I've enclosed a patch that seems to work for me as well. It looks like the earlier patch moved the race for me, but maketab was still built twice, like your logs show (the 2nd time was after proctab.c was built in my logs, a detail I didn't notice until now). Please try the attached patch. Warner On Sat, Jul 31, 2021 at 1:21 PM Kristof Provost wrote: > On 31 Jul 2021, at 20:08, Warner Losh wrote: > > On Sat, Jul 31, 2021 at 11:28 AM Warner Losh wrote: > > > >> > >> > >> On Sat, Jul 31, 2021 at 9:37 AM Kristof Provost > >> wrote: > >> > >>> On 31 Jul 2021, at 16:20, Warner Losh wrote: > >>>> On Sat, Jul 31, 2021 at 8:07 AM Warner Losh wrote: > >>>> > >>>>> > >>>>> > >>>>> On Sat, Jul 31, 2021 at 3:11 AM Kristof Provost > >>>>> wrote: > >>>>> > >>>>>> Hi Warner, > >>>>>> > >>>>>> On 10 Jul 2021, at 19:12, Warner Losh wrote: > >>>>>> > >>>>>> The branch stable/12 has been updated by imp: > >>>>>> > >>>>>> URL: > >>>>>> > >>> > https://cgit.FreeBSD.org/src/commit/?id=3D6edf5082bab71cf923efff9f18e38ef= e5b83b0ec > >>>>>> > >>>>>> commit 6edf5082bab71cf923efff9f18e38efe5b83b0ec > >>>>>> Author: Warner Losh > >>>>>> AuthorDate: 2021-07-07 23:30:35 +0000 > >>>>>> Commit: Warner Losh > >>>>>> CommitDate: 2021-07-10 17:11:15 +0000 > >>>>>> > >>>>>> one-true-awk: import 20210221 (1e4bc42c53a1) which fixes a number > >>>>>> of > >>>>>> bugs > >>>>>> > >>>>>> Import the latest bsd-features branch of the one-true-awk > >>>>>> upstream: > >>>>>> > >>>>>> o Move to bison for $YACC > >>>>>> o Set close-on-exec flag for file and pipe redirects that aren't > >>>>>> std* > >>>>>> o lots of little fixes to modernize ocde base > >>>>>> o free sval member before setting it > >>>>>> o fix a bug where a{0,3} could match aaaa > >>>>>> o pull in systime and strftime from NetBSD awk > >>>>>> o pull in fixes from {Net,Free,Open}BSD (normalized our code with > >>>>>> them) > >>>>>> o add BSD extensions and, or, xor, compl, lsheift, rshift (mostly > >>>>>> a > >>>>>> nop) > >>>>>> > >>>>>> Also revert a few of the trivial FreeBSD changes that were done > >>>>>> slightly > >>>>>> differently in the upstreaming process. Also, our PR database may > >>>>>> have > >>>>>> been mined by upstream for these fixes, and Mikolaj Golub may > >>>>>> deserve > >>>>>> credit for some of the fixes in this update. > >>>>>> > >>>>>> Suggested by: Mikolaj Golub > >>>>>> PR: 143363,143365,143368,143369,143373,143375,214782 > >>>>>> Sponsored by: Netflix > >>>>>> > >>>>>> (cherry picked from commit > >>>>>> f39dd6a9784467f0db5886012b3f4b13899be6b8) > >>>>>> > >>>>>> I *think* this is the relevant commit, but I=E2=80=99m not 100% su= re. > >>>>>> > >>>>>> Anyway, I=E2=80=99ve recently started seeing issues building pfSen= se > >>>>>> for > >>>>>> aarch64. > >>>>>> I=E2=80=99ve finally narrowed it down, and replicated the problem = on > >>>>>> base > >>>>>> FreeBSD > >>>>>> (stable/12, but I assume other branches are affected too). > >>>>>> > >>>>>> It fails to build proctab.c. This file is generated by maketab, a > >>>>>> tool > >>>>>> built as part of the build process. In my case this tool is built > >>>>>> for > >>>>>> aarch64, which makes executing it on amd64 less successful than > >>>>>> we=E2=80=99d like. > >>>>>> > >>>>>> This only happens when building with META_MODE though. I do not > >>>>>> understand the build system sufficiently to debug why. Hopefully > >>>>>> you=E2=80=99ll > >>>>>> have a better idea. > >>>>>> > >>>>> Generally I do, but this one is a bit weird. Also, the amount of > >>>>> context > >>>>> you've included omits the actual error :( Though I'm guessing it's > >>>>> wrong > >>>>> arch for the build tool... > >>>>> > >>>>> I rarely use meta mode, and understand it not at all, but awk > >>>>> follows > >>>>> the > >>>>> same patterns as /bin/sh and /bin/csh does > >>>>> > >>>> > >>>> [[ stupid gmail ]] > >>>> > >>>> I've just pushed removal of proctab.c. That may fix this, though > >>>> I'm > >>>> not > >>>> hopeful. > >>> Unfortunately that didn=E2=80=99t help. > >>> > >>>> I've rarely used metamode, and not for quite some time, but this > >>>> an extra file that would confuse things so that maketab might not > >>>> be > >>>> built > >>>> during build-tools and instead is built later. Please give that a > >>>> try, > >>>> and > >>>> I'll start a meta build, but that takes a while, not least because > >>>> I > >>>> have > >>>> to re-leran how to do that :) > >>>> > >>> I=E2=80=99ve posted my build log and the proctab.c.meta and maketab.m= eta > >>> files > >>> on https://people.freebsd.org/~kp/meta/ > >>> > >>> I=E2=80=99m a little confused by maketab.meta, because what=E2=80=99s= in the > >>> meta > >>> file doesn=E2=80=99t seem to match the build command seen in the > >>> metamode.log > >>> file. > >>> > >> > >> Yea. It's getting confused and rebuilding it bogusly. For the mknodes > >> in > >> sh, we don't see the naked cc command, but we do for maketab. > >> > >> I'm testing a fix right now, though, and we'll see if that fixes > >> things. I > >> think I know what's going on. > >> > > > > I just pushed 1dfb6e5d1f462af4f4df818ee93766f09f3aa787, which fixed > > the > > issues I was seeing. Does that do the trick for you as well? > > > Unfortunately that doesn=E2=80=99t appear to have worked. > > I=E2=80=99ve uploaded the log of this build run (after I=E2=80=99d delete= d > everything in /usr/obj) here: > https://people.freebsd.org/~kp/meta/metamode_1dfb6e5d1f462af.log > > Best regards, > Kristof > --00000000000060b43f05c87063d3 Content-Type: application/octet-stream; name="awk-fix.diff" Content-Disposition: attachment; filename="awk-fix.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_krs65uar0 L2hvbWUvaW1wL2dpdC9zdGFibGUtMTIK --00000000000060b43f05c87063d3--