mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-23 14:30:39 +01:00
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 <jan@janware.com>
This commit is contained in:
parent
0186d346a5
commit
2a0694a497
1 changed files with 16 additions and 0 deletions
16
make/defs.mk
16
make/defs.mk
|
|
@ -79,6 +79,22 @@ ifndef PRINTF
|
||||||
PRINTF := $(shell $(WHICH) printf)
|
PRINTF := $(shell $(WHICH) printf)
|
||||||
endif
|
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
|
PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
|
||||||
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
|
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
|
||||||
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
|
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue