Browse Source

package/gdb: enable python3 support

gdb python support now uses Python3 if python3 is selected, otherwise
uses python(2) as before.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
[yann.morin.1998@free.fr: drop the gdb-python-config duplication]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Titouan Christophe 4 years ago
parent
commit
ae18c6bbaf
2 changed files with 9 additions and 3 deletions
  1. 1 2
      package/gdb/Config.in
  2. 8 1
      package/gdb/gdb.mk

+ 1 - 2
package/gdb/Config.in

@@ -80,8 +80,7 @@ config BR2_PACKAGE_GDB_TUI
 
 
 config BR2_PACKAGE_GDB_PYTHON
 config BR2_PACKAGE_GDB_PYTHON
 	bool "Python support"
 	bool "Python support"
-	# Only Python 2.x is supported by gdb for now
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	help
 	help
 	  This option enables Python support in the target gdb.
 	  This option enables Python support in the target gdb.
 
 

+ 8 - 1
package/gdb/gdb.mk

@@ -194,11 +194,18 @@ GDB_CONF_OPTS += --disable-tui
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_GDB_PYTHON),y)
 ifeq ($(BR2_PACKAGE_GDB_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure.
+GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR)
+GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR)
+GDB_DEPENDENCIES += python3
+else
 # CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure.
 # CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure.
 GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
 GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
 GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
 GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
-GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config
 GDB_DEPENDENCIES += python
 GDB_DEPENDENCIES += python
+endif
+GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config
 else
 else
 GDB_CONF_OPTS += --without-python
 GDB_CONF_OPTS += --without-python
 endif
 endif