[rtems-source-builder commit] gdb: Split python's version into major/minor and check for embed option
Chris Johns
chrisj at rtems.org
Tue Apr 26 23:12:32 UTC 2022
Module: rtems-source-builder
Branch: master
Commit: 70f302e08c9053637f5eff7dfb52d3442aaf76cb
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=70f302e08c9053637f5eff7dfb52d3442aaf76cb
Author: Chris Johns <chrisj at rtems.org>
Date: Tue Apr 26 10:13:41 2022 +1000
gdb: Split python's version into major/minor and check for embed option
Closes #4631
---
source-builder/config/gdb-common-1.cfg | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/source-builder/config/gdb-common-1.cfg b/source-builder/config/gdb-common-1.cfg
index c7f3955..68eb0f3 100644
--- a/source-builder/config/gdb-common-1.cfg
+++ b/source-builder/config/gdb-common-1.cfg
@@ -81,6 +81,8 @@
%define gdb-python-config %(command -v %{gdb-enable-python}-config || true)
%endif
%define gdb-python-ver-mm %(%{gdb-enable-python} --version 2>&1 | sed -e 's/.* //g' | rev | cut -d'.' -f2- | rev)
+%define gdb-python-ver-major %(echo "%{gdb-python-ver-mm}" | sed -e 's/\..*//')
+%define gdb-python-ver-minor %(echo "%{gdb-python-ver-mm}" | sed -e 's/.*\.//')
%define gdb-python-header Python.h
%define gdb-python-ver-header python%{gdb-python-ver-mm}/%{gdb-python-header}
%define gdb-python-ver-lib libpython%{gdb-python-ver-mm}.*
@@ -109,7 +111,8 @@
%endif
%if %{gdb-python-config} != %{nil}
%define gdb-python-lib-filter awk 'BEGIN{FS=" "}/python/{for(i=1;i<NF;++i)if(match($i,".*lpython.*")) print "lib"substr($i,3)"*";}'
- %if %{gdb-python-ver-mm} < 3.8
+ %if %{gdb-python-ver-major} < 3 || \
+ %{gdb-python-ver-major} == 3 && %{gdb-python-ver-minor} < 8
%define gdb-python-config-lib-check-flags --ldflags
%else
%define gdb-python-config-lib-check-flags --ldflags --embed
More information about the vc
mailing list