From 6e66f7538112d2f5fb1af17dbde33ba37a7171be Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 9 Oct 2017 12:50:58 -0400 Subject: [PATCH] Don't try building gdb against guile-2.2 GDB currently doesn't build with Guile 2.2 (see PR 21104). If one has both Guile 2.2 and 2.0 installed, GDB will pick up Guile 2.2 first and fail building. Until somebody does the work of adapting the GDB code to Guile 2.2, we should not try using it. This patch therefore removes it from configure. gdb/ChangeLog: * configure.ac (try_guile_versions): Remove guile-2.2. * configure: Regenerate. --- gdb/ChangeLog | 5 +++++ gdb/configure | 4 ++-- gdb/configure.ac | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0688f95e64e..7c8c6e4fe5b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-09 Simon Marchi + + * configure.ac (try_guile_versions): Remove guile-2.2. + * configure: Regenerate. + 2017-10-09 Tom Tromey * Makefile.in (COMPILE.post, POSTCOMPILE): Restore $(basename). diff --git a/gdb/configure b/gdb/configure index 4d473cc934c..6b445e4f675 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5950,7 +5950,7 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depdir" -# Create sub-directories for objects and depedencies. +# Create sub-directories for objects and dependencies. CONFIG_SRC_SUBDIR="arch" @@ -10313,7 +10313,7 @@ fi -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-2.0" have_libguile=no case "${with_guile}" in no) diff --git a/gdb/configure.ac b/gdb/configure.ac index 4d8d6c7e767..4e64c80f62c 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1138,7 +1138,7 @@ AC_MSG_RESULT([$with_guile]) dnl We check guile with pkg-config. AC_PATH_PROG(pkg_config_prog_path, pkg-config, missing) -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-2.0" have_libguile=no case "${with_guile}" in no) -- 2.30.2