Skip to content

makefiles/info-global.inc.mk: bug: fix DISABLE_MODULE_GLOBAL value#12010

Merged
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/info_global/disable_module
Aug 21, 2019
Merged

makefiles/info-global.inc.mk: bug: fix DISABLE_MODULE_GLOBAL value#12010
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/info_global/disable_module

Conversation

@cladmi
Copy link
Contributor

@cladmi cladmi commented Aug 14, 2019

Contribution description

The value must be saved from the original value to allow restoring it.

This has currently no impact as 'makefiles/defaultmodules.inc.mk'
and 'DISABLE_MODULE' are ignored in this parsing.

Testing procedure

With this diff applied:

diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk
index 9e49a74a1..3189072b2 100644
--- a/makefiles/info-global.inc.mk
+++ b/makefiles/info-global.inc.mk
@@ -14,6 +14,7 @@ define board_missing_features
   DISABLE_MODULE    := $(DISABLE_MODULE_GLOBAL)
   FEATURES_REQUIRED := $(FEATURES_REQUIRED_GLOBAL)
   FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
+  $$(warning DISABLE_MODULE == $$(DISABLE_MODULE))
 
   # Remove board specific variables set by Makefile.features/Makefile.dep
   FEATURES_PROVIDED :=

The value is now correct:

BOARDS=native make --no-print-directory -C tests/shell/ info-boards-supported
/home/harter/work/git/RIOT/makefiles/info-global.inc.mk:42: DISABLE_MODULE == auto_init
native

as it is the same as when compiling normally:

BOARD=native make --no-print-directory -C tests/shell/ info-debug-variable-DISABLE_MODULE
auto_init

Where in master it was empty:

BOARDS=native make --no-print-directory -C tests/shell/ info-boards-supported
/home/harter/work/git/RIOT/makefiles/info-global.inc.mk:42: DISABLE_MODULE == 
native

Issues/PRs references

Contribution in the context of #11477 while debugging with the output of #12004

The value must be saved from the original value to allow restoring it.

This has currently no impact as 'makefiles/defaultmodules.inc.mk'
and 'DISABLE_MODULE' are ignored in this parsing.
@jcarrano jcarrano added Area: build system Area: Build system Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Aug 14, 2019
@jcarrano jcarrano added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Aug 20, 2019
Copy link
Contributor

@jcarrano jcarrano left a comment

Choose a reason for hiding this comment

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

Ok.

@cladmi
Copy link
Contributor Author

cladmi commented Aug 21, 2019

Thank you for the review.

@cladmi cladmi deleted the pr/makefiles/info_global/disable_module branch August 21, 2019 15:17
@kb2ma kb2ma added this to the Release 2019.10 milestone Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants