From 3fed4c0b7adeae7b2bfd9aa59818bb8f3f381031 Mon Sep 17 00:00:00 2001 From: Romain Geissler Date: Fri, 6 Nov 2020 17:47:21 +0000 Subject: [PATCH] gdb: better static python detection in configure machinery In python 3, itertools is a builtin module, so whether or not the python you link against is a shared or a static one, importing it works. Change the import test to use ctypes which is a dynamic module in both python 2 and 3. gdb/ChangeLog: PR python/26832 * configure: Regenerate. * configure.ac: Check for python modules ctypes instead of itertools. --- gdb/ChangeLog | 7 +++++++ gdb/configure | 2 +- gdb/configure.ac | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b846426f89e..93de188b6c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-11-06 Romain Geissler + + PR python/26832 + * configure: Regenerate. + * configure.ac: Check for python modules ctypes instead of + itertools. + 2020-11-06 Pedro Alves * macroexp.c (struct macro_buffer): Split in two classes. Add diff --git a/gdb/configure b/gdb/configure index aa89158d06d..4a03cd9c3ec 100755 --- a/gdb/configure +++ b/gdb/configure @@ -16076,7 +16076,7 @@ main () { int err; Py_Initialize (); - err = PyRun_SimpleString ("import itertools\n"); + err = PyRun_SimpleString ("import ctypes\n"); Py_Finalize (); return err == 0 ? 0 : 1; ; diff --git a/gdb/configure.ac b/gdb/configure.ac index bfc053ed096..1b9548eef3a 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1686,7 +1686,7 @@ if test "${gdb_native}" = yes; then [#include "Python.h"], [int err; Py_Initialize (); - err = PyRun_SimpleString ("import itertools\n"); + err = PyRun_SimpleString ("import ctypes\n"); Py_Finalize (); return err == 0 ? 0 : 1;])], [dynamic_list=true], [], [true]) -- 2.30.2