All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/gdb: remove python2 support
@ 2022-01-04 20:09 Adam Duskett
  2022-01-06 21:10 ` Romain Naour
  2022-01-13 20:38 ` Thomas Petazzoni
  0 siblings, 2 replies; 4+ messages in thread
From: Adam Duskett @ 2022-01-04 20:09 UTC (permalink / raw)
  To: buildroot; +Cc: Adam Duskett

According to the GDB 9.2 changelog, python3 has been supported since at least
2019.

- Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host

- Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy

- Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to
  depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 Config.in.legacy           |  7 +++++++
 package/gdb/Config.in      |  2 +-
 package/gdb/Config.in.host |  5 -----
 package/gdb/gdb.mk         | 10 +---------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 5994d94487..a126d56052 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_HOST_GDB_PYTHON
+	bool "GDB Python2 support removed"
+	select BR2_LEGACY
+	help
+	  Python2 is deprecated and no longer supported.
+	  Please migrate to Python3.
+
 config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE
 	bool "Bootlin riscv64 glibc bleeding-edge toolchain removed"
 	select BR2_LEGACY
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 6f1a883de7..daad6c910d 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI
 
 config BR2_PACKAGE_GDB_PYTHON
 	bool "Python support"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  This option enables Python support in the target gdb.
 
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index a6e1d7f53c..2c6c78f20a 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON
 	help
 	  This option disables Python support in the cross gdb.
 
-config BR2_PACKAGE_HOST_GDB_PYTHON
-	bool "Python 2"
-	help
-	  This option enables the Python 2 support in the cross gdb.
-
 config BR2_PACKAGE_HOST_GDB_PYTHON3
 	bool "Python 3"
 	help
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 4ff498230a..2929eaf058 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
 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.
-GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
-GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
-GDB_DEPENDENCIES += python
 endif
 GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config
 else
@@ -287,10 +282,7 @@ else
 HOST_GDB_CONF_OPTS += --disable-tui
 endif
 
-ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y)
-HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2
-HOST_GDB_DEPENDENCIES += host-python
-else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y)
 HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3
 HOST_GDB_DEPENDENCIES += host-python3
 else
-- 
2.33.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-01-13 20:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-04 20:09 [Buildroot] [PATCH 1/1] package/gdb: remove python2 support Adam Duskett
2022-01-06 21:10 ` Romain Naour
2022-01-06 21:37   ` Romain Naour
2022-01-13 20:38 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.