Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001 |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 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> |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 14 | Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 15 | |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 16 | --- |
| 17 | setup.py | 4 ++++ |
| 18 | 1 file changed, 4 insertions(+) |
| 19 | |
| 20 | diff --git a/setup.py b/setup.py |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | index 7691258..ec3f2a4 100644 |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 22 | --- a/setup.py |
| 23 | +++ b/setup.py |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 24 | @@ -408,6 +408,14 @@ class PyBuildExt(build_ext): |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 25 | print("%-*s %-*s %-*s" % (longest, e, longest, f, |
| 26 | longest, g)) |
| 27 | |
| 28 | + # There is no need to report missing module dependencies, |
| 29 | + # if the modules have been disabled in the first place. |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 30 | + # cannot use mods_disabled here, because remove_configured_extensions adds |
| 31 | + # only disabled extensions into it (doesn't cover _dbm, _gdbm, readline |
| 32 | + # we support disabling through PACKAGECONFIG) |
| 33 | + sysconf_dis = sysconfig.get_config_var('MODDISABLED_NAMES').split() |
| 34 | + self.missing = list(set(self.missing) - set(sysconf_dis)) |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 35 | + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 36 | if self.missing: |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 37 | print() |
| 38 | print("Python build finished successfully!") |