From 3e22fc45d2690ed8ec3f2a9b01b1f767f3802980 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sun, 27 Oct 2019 08:20:38 +1100 Subject: [PATCH] sb/get-source: Add a macro to indicate the get-source command is running. - Fix GDB's library checks to ignore errors when getting the source. --- source-builder/config/gdb-common-1.cfg | 2 +- source-builder/sb/getsources.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source-builder/config/gdb-common-1.cfg b/source-builder/config/gdb-common-1.cfg index 0f028ff..87b9d0a 100644 --- a/source-builder/config/gdb-common-1.cfg +++ b/source-builder/config/gdb-common-1.cfg @@ -114,7 +114,7 @@ %else %define gdb-python-lib-check %(%{_sbdir}/sb/rtems-build-dep -c %{__cc} %{gdb-host-libs} -l %{gdb-python-ver-lib}) %endif - %if %{gdb-python-lib-check} == not-found + %if %{gdb-python-lib-check} == not-found && !%{_rsb_getting_source} %error "gdb: python: library file not found: %{gdb-python-ver-lib}, please install" %endif %endif diff --git a/source-builder/sb/getsources.py b/source-builder/sb/getsources.py index 4fc9395..7e516b5 100644 --- a/source-builder/sb/getsources.py +++ b/source-builder/sb/getsources.py @@ -281,6 +281,7 @@ class buildset: self.macros = copy.copy(opts.defaults) else: self.macros = copy.copy(macros) + self.macros.define('_rsb_get_source') log.trace('_bset: %s: macro defaults' % (bset)) log.trace(str(self.macros)) self.bset = bset