From d7511b9d00742c3e2d57c6c03718c4a6f4cd3e72 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Thu, 29 Feb 2024 22:11:00 +0100 Subject: 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 --- lang/lua52/Makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lang/lua52') diff --git a/lang/lua52/Makefile b/lang/lua52/Makefile index 668565afb4ad..6b1c8c2f4da5 100644 --- a/lang/lua52/Makefile +++ b/lang/lua52/Makefile @@ -14,14 +14,6 @@ LICENSE= MIT USES= cpe libedit lua:core,52 USE_LDCONFIG= yes -# Overriding __MAKE_CONF makes sure that we don't re-parse -# /etc/make.conf during do-build, which would jeopardize the build -# if, for instance, the user set CFLAGS=mumble -# NOTE: /etc/make.conf is read BEFORE Makefile, so we already -# have its settings when we get here. -# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt -MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} - # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. CPPFLAGS+= -I${LOCALBASE}/include -- cgit v1.3