janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

dirs.mk: Fix empty PREREQ variable

Browse source 
The contents of this variable got lost somewhere along the way, don't
know when. This led to prerequisites not being checked, most notably
from topdir.mk, where the build should bail out if attempting a build
modules out of order. It's now filled in every directory by running
projects.py, which might be somehwat overkill.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-03-16 14:02:06 +00:00
commit 22b6236e6d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/dirs.mk
View file

@ -33,8 +33,9 @@ SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
endif
ifneq ($(DONT_CHECK_PREREQ_DONE),true)
PREREQ_DIRS = $(foreach p, $(PREREQ), $(call proj_dir, $(p)))
PREREQ_DIRS_DONE = $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ))
PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
endif
all: dirs-all.done