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