From owner-dev-commits-src-all@freebsd.org Tue Aug 3 15:26:28 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 4A17B63A7E4 for ; Tue, 3 Aug 2021 15:26:28 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 4GfJch1LPPz4q2G for ; Tue, 3 Aug 2021 15:26:28 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f51.google.com with SMTP id p5so25765856wro.7 for ; Tue, 03 Aug 2021 08:26:28 -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=Dapzr5nTubN4XmGhA2Ht9dT3hMZapyn7zixsbO1MVPw=; b=SgwriR7Xfjdjv2MSBkr95NsUhRltzwmZRk/ClBJGzFaPfW1a1nB7+KcOPCEWhIItcV TT4/TDJcnt1VvA8tmqBc+XpVfo+skQqqkEO4sxKXdYSnUrXIWGKiEfwBfcNtwmFeUN8y /3HRFxAGgwryMEzEPFjgYB3OW4fIg5tFLsnYoBlYgrl14/bppzWwe/gbDDDNK7V47E4M 7NSWOw80AIELyEzDELNO2DZwfC3zKDyoPKQa3Iivdo7v6vNBs5n2GXTtaUC+TtO/h/Mj edSlIlTpuF0zkQhAajTiQd0sn39hQMSJStccIXSe6LYqmMksU88tEPyvyMFgwyFSRinS N5cQ== X-Gm-Message-State: AOAM533/dFUWW4V0Te/8hvXWGGBNpWj/7e6qCsPUVaq2/X67z17asGYl fVxUk0M5y+TOrdxxj0lIu2E0AV4gESV96WPJ X-Google-Smtp-Source: ABdhPJz6dTPQzt15GJqxiWTd3CvxSuhk4mz8+e3I6SZGTDCIkMtOSJJ54dwzMtG6alCAYOHjRXLNOw== X-Received: by 2002:a5d:6908:: with SMTP id t8mr24107524wru.421.1628004380713; Tue, 03 Aug 2021 08:26:20 -0700 (PDT) Received: from smtpclient.apple (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id h9sm13519323wmb.35.2021.08.03.08.26.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Aug 2021 08:26:20 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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: <202108031522.173FMHF9030395@gitrepo.freebsd.org> Date: Tue, 3 Aug 2021 16:26:19 +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: <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> References: <202108031522.173FMHF9030395@gitrepo.freebsd.org> To: Bryan Drewery X-Mailer: Apple Mail (2.3654.100.0.2.22) X-Rspamd-Queue-Id: 4GfJch1LPPz4q2G X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 15:26:28 -0000 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) Why was this reverted? This restores the bug I was fixing. Does your change below not fix the actual issue you were seeing? Jess > .error MAKEOBJDIRPREFIX can only be set in environment or = src-env.conf(5),\ > not as a global (in make.conf(5) or src.conf(5)) or command-line = variable. > .endif > diff --git a/Makefile.inc1 b/Makefile.inc1 > index e3707c7a504a..b6843177c10b 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -2739,7 +2739,6 @@ SUBDIR=3D ${SUBDIR_OVERRIDE} > NXBMAKEARGS+=3D \ > OBJTOP=3D${NXBOBJTOP:Q} \ > OBJROOT=3D${NXBOBJROOT:Q} \ > - MAKEOBJDIRPREFIX=3D \ > -DNO_SHARED \ > -DNO_CPU_CFLAGS \ > -DNO_PIC \ > @@ -2763,6 +2762,9 @@ NXBMAKEARGS+=3D \ > MK_WERROR=3Dno \ > MK_ZFS=3Dno >=20 > +NXBMAKEENV+=3D \ > + MAKEOBJDIRPREFIX=3D > + > .if make(native-xtools*) && \ > (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH)) > .error Missing NXB_TARGET / NXB_TARGET_ARCH