From owner-dev-commits-src-all@freebsd.org Tue Aug 3 17:00:46 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 9D77163C6FE; Tue, 3 Aug 2021 17:00:46 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GfLjV3ptWz3Jg1; Tue, 3 Aug 2021 17:00:46 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1628010046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yIEWHk/HgNJM/zJoym1//7stV4hF4rEIasYMH6/NeMU=; b=EhIdkk0JWQmQrXevBtNPOJV8WHGB+01IPsrGz6zajTtXkeuRH3U8/oKdvoKBm7Z/LqlxnJ R5Ay9qMcOC1kZ3c9qw37nE68tnL9h31sJXcYmslWHqpz6hnQKzwJKg/e2v+isiynJAOqfi AhP++gfqurZ4DxDDuJ514+x1+yEoxDOSSo7QCwMvyRavASr4Ibsf2E1wRjtTpEZ3tEhwqX NLZJHQPnyEAANkOqzr7Ag4A5LWTMXHG9eXpTYzZEeBeqNWqVp0Vk9eQsdoBFq1vWXAGvMK FDh0lqLlSdIjKjFLs5oevNnzTvtNb38vZIP9KMvjYCkOFGtGS0+cSTTXre7FLw== Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 5215A1089E; Tue, 3 Aug 2021 17:00:46 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 45579309E4; Tue, 3 Aug 2021 17:00:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id f4iDVh4KWKFb; Tue, 3 Aug 2021 17:00:42 +0000 (UTC) Subject: Re: git: 36269b823182 - main - Fix native-xtools build DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 6686A309D0 To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202108031522.173FMHF9030395@gitrepo.freebsd.org> <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <2ea87511-69e8-084a-6148-c4b071346076@FreeBSD.org> Date: Tue, 3 Aug 2021 10:00:39 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="20FTa2FgqScQfgS62zyXj3XzGhrh4KcDu" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1628010046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yIEWHk/HgNJM/zJoym1//7stV4hF4rEIasYMH6/NeMU=; b=nf5hzB5VlMl1sLyDsbABVVJwHCTKYmtCzcVM1NvtbFUyCGLp1Lg96NY3NuhWZ0RZZykPrE 1tz8Xn7GBZV+E59jsbXjaBd9MW0JX9ht6hYuwC9ro/aXvq0HJNosDQ12NcWizAxhehMSmc Blgq/BAAZfl5BgAcDbD8Y1Q4FpRUdEyND0oo8OzWxZCgY5idhxiziMH9DBldXIxeAKck4o X7cUtcCtMI13qWtuhEgl9uupRTJAJU4Z0JaGluNgO4VkiUfzuCnFoj8bqjHXGgwvf74/fg UkgupK/PoI78PSHZGJjNnikHlsKBginf7sK3SlRI9/luvCypjyprYRB6fo6JLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1628010046; a=rsa-sha256; cv=none; b=LgT8G4uRc9g/VQs0XPBnsksf/AJK8IisKB/Zpu0ZoYHbr/xl70HgRg3zceLE4Y3AxRI2x8 w77/F9zMD8dQI9atP70sbFYM0bvNpBGf4bmtfHnZkmvEVA37DKTsQZuXmmtWQXv+LAusO4 d1JHBYVzZRoX9xW98xp1FG7HH5wZkuDozkZBGinBmFEpPG8tObcWV+wRH8kHthppRPMok1 PR4QJsBSyVuC6SLrXMAm9U8nLWwXoPDBjDYFHLNV6jVDURRocPH3bLVzHgupE0KDhvPy0u PGE4AXsMXc29yMdjHAIh51YvcbEw3nGDW6SatuEarc3ZcDOqwVIjvkyO0DS5Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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:00:46 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --20FTa2FgqScQfgS62zyXj3XzGhrh4KcDu Content-Type: multipart/mixed; boundary="ReUHfC152P2qIWeljJMTM3LgYXMgOUAbe"; protected-headers="v1" From: Bryan Drewery To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-ID: <2ea87511-69e8-084a-6148-c4b071346076@FreeBSD.org> Subject: Re: git: 36269b823182 - main - Fix native-xtools build References: <202108031522.173FMHF9030395@gitrepo.freebsd.org> <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> In-Reply-To: <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> --ReUHfC152P2qIWeljJMTM3LgYXMgOUAbe Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 8/3/2021 8:26 AM, Jessica Clarke wrote: > On 3 Aug 2021, at 16:22, Bryan Drewery wrote: >> >> The branch main has been updated by bdrewery: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36269b82318280ef184c953= b90674f5905e0f53f >> >> commit 36269b82318280ef184c953b90674f5905e0f53f >> Author: Bryan Drewery >> AuthorDate: 2021-08-03 15:20:57 +0000 >> Commit: Bryan Drewery >> CommitDate: 2021-08-03 15:22:14 +0000 >> >> Fix native-xtools build >> >> 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(-) >> >> 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${PAT= H} ${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:MMAKEOBJDIRPRE= FIX) >> +.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 Sorry! This was not meant to be removed. It was just a mishap from testin= g. I reverted it and pushed the proper fix just now. > Jess >=20 >> .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 v= ariable. >> .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 >> >> +NXBMAKEENV+=3D \ >> + MAKEOBJDIRPREFIX=3D >> + >> .if make(native-xtools*) && \ >> (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH)) >> .error Missing NXB_TARGET / NXB_TARGET_ARCH >=20 --=20 Regards, Bryan Drewery --ReUHfC152P2qIWeljJMTM3LgYXMgOUAbe-- --20FTa2FgqScQfgS62zyXj3XzGhrh4KcDu Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEE+Rc8ssOq6npcih8JNddxu25Gl88FAmEJdjcFAwAAAAAACgkQNddxu25Gl89x 5wgArHRmE7H3hQPn6JKvJCKWy2N572dZiWZClyOv45T7eZq3YmeQg9BVNiaxrMRWVwKzS4JF/lI9 djTfDRUZMqdLlaRWvsSiZQXrA+thpQMgWUzH36yR2W0UMuqxMscoZh8aoRoVNgQL1axanFi9giWT KpMzXLVS77IMeYbR+FyNdZfrNQAjxc/gTO9xNQRR4VubEx0PKT54xlFrUEzSWl5uhxApcKE+AU5Q Jw8vZf7nPH8FA+kkKe0PtHgREPnEAAP4fciJpemf9DGMGorbuVc+1VKAADrcAXuvmppkve62QCYQ 9VPOw8QgpX11XTk5RE3anzxNkJqhZg194CNo2auFoA== =qa3z -----END PGP SIGNATURE----- --20FTa2FgqScQfgS62zyXj3XzGhrh4KcDu--