aboutsummaryrefslogtreecommitdiff
path: root/astro
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2024-02-29 21:11:00 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2024-03-23 11:19:32 +0000
commitd7511b9d00742c3e2d57c6c03718c4a6f4cd3e72 (patch)
tree9d8213e1b1e5282e29759072d5d6995f80545f7f /astro
parentbf99270dd45b421fdb90b36ea45c88bb19a9562f (diff)
downloadports-d7511b9d00742c3e2d57c6c03718c4a6f4cd3e72.tar.gz
ports-d7511b9d00742c3e2d57c6c03718c4a6f4cd3e72.zip
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
Diffstat (limited to 'astro')
-rw-r--r--astro/wmspaceweather/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index 44a55987e1ac..31a89888ae0c 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather
SHEBANG_FILES= GetKp
USE_XORG= x11 xext xpm
ALL_TARGET= clean all
+MAKE_ENV= OPSYS=${OPSYS}
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/GetKp bin/wmSpaceWeather \