From owner-dev-commits-src-all@freebsd.org Tue Aug 3 17:32:13 2021 Return-Path: Delivered-To: dev-commits-src-all@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 C303863D4C5 for ; Tue, 3 Aug 2021 17:32:13 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 4GfMPm6RJnz3MBG for ; Tue, 3 Aug 2021 17:32:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f44.google.com with SMTP id m20-20020a05600c4f54b029024e75a15716so2592562wmq.2 for ; Tue, 03 Aug 2021 10:32:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=dpfcn/hTtKIb5g3S4tkUG5cGk+DGMyr0/pkUUcCT5Lw=; b=YJ2PmQv2DtkFggYGfNoFiiqxGcdZhbY/G/X3m3d3nkeK/Py3gdvhgG29rsvT+Nw6lX /nfMEqrjTTR/XkwC81QszeyKe6ISoSNMXXH4ZDYIG6jeW11gAI8NJNUEIZr0QVpXQVuL W9nznxzKyE0DcPzSGK/tiHBdfeJ2DpdL8jPLIp8njS7YsHwtnAsh9jCnl3LiwvVED7mL YmQCaNa6oR4mLNujYgSDFJbyYWiuh35qJ58Cc5ijuvycgZKpWm+yQtmGf5MYaAQ8IfIP QtRlAzSwcac2puo4Sjkfsvzxjo9UrG3yAi5EmwzELid6Zbnoj9r+HRV1UUGOVIsmHZL0 W71A== X-Gm-Message-State: AOAM530jlfKy0QM5JHFdrr08RsI1Q11RMI9DE3VLVrHIIceB0SxIeRct eGJ1N8gRV7DGOGJebozllMdpPA== X-Google-Smtp-Source: ABdhPJywWvp2p9IJg11+NH1QTKehK/Hr8u5XdcNj0C1G4x5Mc/Vgu7Q959eJmTDL+32vY2BxPkIq+g== X-Received: by 2002:a1c:7c10:: with SMTP id x16mr23187271wmc.41.1628011925941; Tue, 03 Aug 2021 10:32:05 -0700 (PDT) Received: from smtpclient.apple (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id x18sm7895924wmc.17.2021.08.03.10.32.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Aug 2021 10:32:05 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.100.0.2.22\)) Subject: Re: git: 36269b823182 - main - Fix native-xtools build From: Jessica Clarke In-Reply-To: <2ea87511-69e8-084a-6148-c4b071346076@FreeBSD.org> Date: Tue, 3 Aug 2021 18:32:05 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <60B4BA12-B543-4FCE-AA8C-05BF461A1F13@freebsd.org> References: <202108031522.173FMHF9030395@gitrepo.freebsd.org> <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> <2ea87511-69e8-084a-6148-c4b071346076@FreeBSD.org> To: Bryan Drewery X-Mailer: Apple Mail (2.3654.100.0.2.22) X-Rspamd-Queue-Id: 4GfMPm6RJnz3MBG X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.49 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.99)[-0.987]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.44:from,131.111.193.104:received]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.44:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 17:32:13 -0000 On 3 Aug 2021, at 18:00, Bryan Drewery wrote: >=20 > On 8/3/2021 8:26 AM, Jessica Clarke wrote: >> On 3 Aug 2021, at 16:22, Bryan Drewery wrote: >>>=20 >>> The branch main has been updated by bdrewery: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D36269b82318280ef184c953b90674f59= 05e0f53f >>>=20 >>> commit 36269b82318280ef184c953b90674f5905e0f53f >>> Author: Bryan Drewery >>> AuthorDate: 2021-08-03 15:20:57 +0000 >>> Commit: Bryan Drewery >>> CommitDate: 2021-08-03 15:22:14 +0000 >>>=20 >>> Fix native-xtools build >>>=20 >>> Fixes https://github.com/freebsd/poudriere/issues/894 >>> Fixes: d0c737e18 ("Makefile: Fix MAKEOBJDIRPREFIX = command-line") >>> X-MFC-With: d0c737e18 >>> --- >>> Makefile | 2 +- >>> Makefile.inc1 | 4 +++- >>> 2 files changed, 4 insertions(+), 2 deletions(-) >>>=20 >>> diff --git a/Makefile b/Makefile >>> index c64873fb241b..711854f4693c 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -218,7 +218,7 @@ _MAKEOBJDIRPREFIX!=3D /usr/bin/env -i = PATH=3D${PATH} ${MAKE} MK_AUTO_OBJ=3Dno \ >>> ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=3D*} __MAKE_CONF=3D${__MAKE_CONF} = \ >>> SRCCONF=3D${SRCCONF} SRC_ENV_CONF=3D \ >>> -f /dev/null -V MAKEOBJDIRPREFIX dummy >>> -.if !empty(_MAKEOBJDIRPREFIX) || = !empty(.MAKEOVERRIDES:MMAKEOBJDIRPREFIX) >>> +.if !empty(_MAKEOBJDIRPREFIX) >>=20 >> Why was this reverted? This restores the bug I was fixing. Does your >> change below not fix the actual issue you were seeing? >>=20 >=20 > Sorry! This was not meant to be removed. It was just a mishap from = testing. >=20 > I reverted it and pushed the proper fix just now. Thanks, glad my understanding was correct. I=E2=80=99ll give my commit = longer to bake before MFC=E2=80=99ing with this one to see if any other = regressions pop up. Jess