git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 246c5ffe75a2d494e415d8a7522df9fe22056d41 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Mon, 7 Oct 2019 13:22:14 +0200
   4 Subject: [PATCH] setup.py: do not report missing dependencies for disabled
   5  modules
   6
   7 Reporting those missing dependencies is misleading as the modules would not
   8 have been built anyway. This particularly matters in oe-core's automated
   9 build completeness checker which relies on the report.
  10
  11 Upstream-Status: Inappropriate [oe-core specific]
  12 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  13 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  14 Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
  15 Refresh for 3.10.7:
  16 Signed-off-by: Tim Orling <tim.orling@konsulko.com>
  17
  18 ---
  19  setup.py | 8 ++++++++
  20  1 file changed, 8 insertions(+)
  21
  22 diff --git a/setup.py b/setup.py
  23 index 85a2b26357..7605347bf5 100644
  24 --- a/setup.py
  25 +++ b/setup.py
  26 @@ -517,6 +517,14 @@ def print_three_column(lst):
  27                  print("%-*s   %-*s   %-*s" % (longest, e, longest, f,
  28                                                longest, g))
  29
  30 +        # There is no need to report missing module dependencies,
  31 +        # if the modules have been disabled in the first place.
  32 +        # cannot use mods_disabled here, because remove_configured_extensions adds
  33 +        # only disabled extensions into it (doesn't cover _dbm, _gdbm, readline
  34 +        # we support disabling through PACKAGECONFIG)
  35 +        sysconf_dis = sysconfig.get_config_var('MODDISABLED_NAMES').split()
  36 +        self.missing = list(set(self.missing) - set(sysconf_dis))
  37 +
  38          if self.missing:
  39              print()
  40              print("The necessary bits to build these optional modules were not "