Re: git: d7511b9d0074 - main - Mk/bsd.port.mk: Add __MAKE_CONF=${NONEXISTENT} to WRK_ENV
Date: Sat, 23 Mar 2024 16:52:52 UTC
On Sat, 23 Mar 2024 17:45:53 +0100 Tijl Coosemans <tijl@FreeBSD.org> wrote: > On Sat, 23 Mar 2024 22:54:34 +0900 Tomoaki AOKI wrote: > > Just want to be 100% sure before updating ports tree to this commit and > > later. > > > > Does this mean something like "DEFAULT_VERSIONS+= ssl=base" > > in /etc/make.conf still work fine? > > (Means, does this change doesn't affect for ports tree, but affects > > only Makefile under ${WRKDIR}?) > > Yes. Thanks for clarification! Now I can go forward. > > If yes, no problem, maybe. > > If no, please revert this ASAP. It's too hazardous. > > > > Regards. > > > >> The branch main has been updated by tijl: > >> > >> URL: > > https://cgit.FreeBSD.org/ports/commit/?id=d7511b9d00742c3e2d57c6c03718c4a6f4cd3e72 > >> > >> commit d7511b9d00742c3e2d57c6c03718c4a6f4cd3e72 > >> Author: Tijl Coosemans <tijl@FreeBSD.org> > >> AuthorDate: 2024-02-29 21:11:00 +0000 > >> Commit: Tijl Coosemans <tijl@FreeBSD.org> > >> CommitDate: 2024-03-23 11:19:32 +0000 > >> > >> Mk/bsd.port.mk: Add __MAKE_CONF=${NONEXISTENT} to WRK_ENV > >> > >> And remove it from individual ports. Use WRK_ENV in custom build > >> commands where necessary. > >> > >> FreeBSD make(1) includes /usr/share/mk/sys.mk and that includes > >> /etc/make.conf if it exists. This happens when you run make in a > >> port directory but it also happens when the upstream build system uses > >> make. This commit disables make.conf inclusion in the latter case > >> because users can define variables like CFLAGS in make.conf that > >> override ports framework variables and this can cause problems that are > >> difficult to diagnose. > >> > >> If there are any build customisations made through make.conf that > >> stop working because of this commit then they should be made available > >> by the ports tree through some mechanism, e.g. an option in a port. > >> > >> Some ports were picking up variables from Poudriere make.conf and > >> required fixes: > >> > >> - astro/wmspaceweather x11-clocks/wmcalclock: Add OPSYS to MAKE_ENV. > >> - games/zhlt: Add ARCH to MAKE_ENV. > >> - graphics/tachyon: Upstream ARCH is not ports tree ARCH. > >> Set ALL_TARGET=bsd so upstream ARCH is defined correctly. > >> Enable multi-threading support while here. > >> > >> PR: 277455 > >> Exp-run by: antoine -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp>