[riot-commits] [RIOT-OS/RIOT] 43781c: build_system: don't optionally use conflicting fea...

benpicco noreply at github.com
Wed Feb 24 20:23:08 CET 2021


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: 43781c3fbacfed54bbf9396dc8588a46f76c5ef4
      https://github.com/RIOT-OS/RIOT/commit/43781c3fbacfed54bbf9396dc8588a46f76c5ef4
  Author: Marian Buschsieweke <marian.buschsieweke at ovgu.de>
  Date:   2021-02-22 (Mon, 22 Feb 2021)

  Changed paths:
    M makefiles/features_check.inc.mk

  Log Message:
  -----------
  build_system: don't optionally use conflicting features

If adding a provided but optional feature would result in a feature conflict,
don't use it.


  Commit: 47414f8e3b5cb70ce7e48f605671405a6da2757f
      https://github.com/RIOT-OS/RIOT/commit/47414f8e3b5cb70ce7e48f605671405a6da2757f
  Author: Marian Buschsieweke <marian.buschsieweke at ovgu.de>
  Date:   2021-02-22 (Mon, 22 Feb 2021)

  Changed paths:
    A makefiles/tests/feature_resolution/test-conflict-optional.mk

  Log Message:
  -----------
  makefiles/tests: add unit tests for fixed bug

Make sure that optional features that would cause conflicts don't end up being
used again.


  Commit: 7c71fb2c785c80403d6da00e6ada9158270933e6
      https://github.com/RIOT-OS/RIOT/commit/7c71fb2c785c80403d6da00e6ada9158270933e6
  Author: benpicco <benjamin.valentin at ml-pa.com>
  Date:   2021-02-24 (Wed, 24 Feb 2021)

  Changed paths:
    M makefiles/features_check.inc.mk
    A makefiles/tests/feature_resolution/test-conflict-optional.mk

  Log Message:
  -----------
  Merge pull request #16012 from maribu/fix-feature-resolution-again

build system: don't optionally use conflicting features


Compare: https://github.com/RIOT-OS/RIOT/compare/2e06957e3bb1...7c71fb2c785c


More information about the commits mailing list