Date: Tue, 3 Aug 2021 10:00:39 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 36269b823182 - main - Fix native-xtools build Message-ID: <2ea87511-69e8-084a-6148-c4b071346076@FreeBSD.org> In-Reply-To: <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org> References: <202108031522.173FMHF9030395@gitrepo.freebsd.org> <21EA81CD-0058-4E80-9FAD-424C0ACCD276@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --20FTa2FgqScQfgS62zyXj3XzGhrh4KcDu Content-Type: multipart/mixed; boundary="ReUHfC152P2qIWeljJMTM3LgYXMgOUAbe"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@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 <bdrewery@FreeBSD.org> wrote: >> >> The branch main has been updated by bdrewery: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36269b82318280ef184c953= b90674f5905e0f53f >> >> commit 36269b82318280ef184c953b90674f5905e0f53f >> Author: Bryan Drewery <bdrewery@FreeBSD.org> >> AuthorDate: 2021-08-03 15:20:57 +0000 >> Commit: Bryan Drewery <bdrewery@FreeBSD.org> >> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2ea87511-69e8-084a-6148-c4b071346076>