Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: allow some ordering of package builds #6113

Closed
wants to merge 3 commits into from
Closed

make: allow some ordering of package builds #6113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f21661
make: allow some package build ordering
kaspar030 Nov 13, 2016
723fbf7
examples: unblacklist nrf52dk due to fixed module build order
kaspar030 Nov 13, 2016
7d7d323
squash: don't always add USEPKG_BUILDFIRST to USEPKG
kaspar030 Nov 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
make: allow some package build ordering
  • Loading branch information
@kaspar030
kaspar030 committed Nov 13, 2016
commit 1f21661c72e243bc9f58bd86f66356675a77b2e5
4 changes: 4 additions & 0 deletions Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,3 +573,7 @@ USEPKG := $(sort $(USEPKG))
ifneq ($(OLD_USEMODULE) $(OLD_USEPKG),$(USEMODULE) $(USEPKG))
include $(RIOTBASE)/Makefile.dep
endif

USEPKG_BUILDFIRST := nordic_softdevice_ble
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this ordering problem persist for packages in USEPKG_BUILDFIRST with the proposed solution?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I consider this a quickfix for the problem at hand. I'd prefer full dependencies, or split download/patch and compile steps. But they'd be a lot more work to implement...


USEPKG := $(USEPKG_BUILDFIRST) $(filter-out $(USEPKG_BUILDFIRST),$(USEPKG))
2 changes: 1 addition & 1 deletion Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ USEMODULE_INCLUDES_ = $(shell echo $(USEMODULE_INCLUDES) | tr ' ' '\n' | awk '!a
INCLUDES += $(USEMODULE_INCLUDES_:%=-I%)

.PHONY: $(USEPKG:%=${BINDIR}/%.a)
$(USEPKG:%=${BINDIR}/%.a): $(RIOTBUILD_CONFIG_HEADER_C)
$(USEPKG:%=${BINDIR}/%.a): $(RIOTBUILD_CONFIG_HEADER_C) $(USEPKG_BUILDFIRST:%=${BINDIR}/%.a)
@mkdir -p ${BINDIR}
"$(MAKE)" -C $(RIOTPKG)/$(patsubst ${BINDIR}/%.a,%,$@)

Expand Down