summaryrefslogtreecommitdiffstats
path: root/source-builder/config
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2019-07-08 22:44:02 +1000
committerChris Johns <chrisj@rtems.org>2019-07-21 21:09:34 +1000
commit8922c8bbb0e14a14f480b136d76f18818d870da9 (patch)
tree930b2829d2599127b2e0127dbb8aac0613d19b8e /source-builder/config
parent5/packages: Add curl and update all packages with RTEMS 5 and LibBSD (diff)
downloadrtems-source-builder-8922c8bbb0e14a14f480b136d76f18818d870da9.tar.bz2
sb/config: Fix GDB probes when using python-config.
- Fix the config file handling of shell calls where the shell command has nesting braces. - Fix the bool check to support a '!' next to the check value.
Diffstat (limited to 'source-builder/config')
-rw-r--r--source-builder/config/gdb-common-1.cfg5
1 files changed, 3 insertions, 2 deletions
diff --git a/source-builder/config/gdb-common-1.cfg b/source-builder/config/gdb-common-1.cfg
index 9018448..159b8a5 100644
--- a/source-builder/config/gdb-common-1.cfg
+++ b/source-builder/config/gdb-common-1.cfg
@@ -108,8 +108,9 @@
%define gdb-host-libs -L '%{host_ldflags}'
%endif
%if %{gdb-python-config} != %{nil}
- %define gdb-python-config-libs -l '%(%{gdb-python-config} --ldflags)'
- %define gdb-python-lib-check %(%{_sbdir}/sb/rtems-build-dep -c %{__cc} %{gdb-host-libs} %{gdb-python-config-libs})
+ %define gdb-python-lib-filter awk 'BEGIN{FS=" "}/python/{for(i=1;i<NF;++i)if(match($i,".*python.*")) print "lib"substr($i,3)"*";}'
+ %define gdb-python-config-libs %(%{gdb-python-config} --ldflags | %{gdb-python-lib-filter})
+ %define gdb-python-lib-check %(%{_sbdir}/sb/rtems-build-dep -c %{__cc} %{gdb-host-libs} -l %{gdb-python-config-libs})
%else
%define gdb-python-lib-check %(%{_sbdir}/sb/rtems-build-dep -c %{__cc} %{gdb-host-libs} -l %{gdb-python-ver-lib})
%endif