From 2a0694a4973d69c4a79b89170a6509d4da6d85ad Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 19 Nov 2019 13:11:51 +0000 Subject: [PATCH] defs.mk: Add PRISTINE_MAKE make carries MAKEFLAGS, PATH, LD_LIBRARY_PATH and umask from the environment to sub-makes, which sometimes is undesirable. So, instead of make -C, $(PRISTINE_MAKE) -C will start a sub-make with a minimal environment consisting of MINIMAL_UMASK, MINIMAL_PATH, MINIMAL_LD_LIBRARY_PATH and MINIMAL_MAKEFLAGS Signed-off-by: Jan Lindemann --- make/defs.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index a54d3fb4..c3b33f1e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -79,6 +79,22 @@ ifndef PRINTF PRINTF := $(shell $(WHICH) printf) endif +ifndef MINIMAL_MAKEFLAGS + MINIMAL_MAKEFLAGS := +endif +ifndef MINIMAL_PATH + MINIMAL_PATH := /usr/sbin:/usr/bin:/sbin:/bin +endif +ifndef MINIMAL_LD_LIBRARY_PATH + MINIMAL_LD_LIBRARY_PATH := +endif +ifndef MINIMAL_UMASK + MINIMAL_UMASK := 0002 +endif +ifndef PRISTINE_MAKE + PRISTINE_MAKE := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE) +endif + PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh LOG_INSTALL_SH := $(PKG_SH_EXE) log-install UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild