From da658607ed24bc5a4dcfcfb56b6e1440ccab33d2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 16 Sep 2018 09:52:09 -0600 Subject: [PATCH] Check for gmp when checking for mpfr There was a report on irc that the gdb check for mpfr failed when only static libraries are available. The issue is that mpfr depends on gmp, but this is not handled explicitly by gdb. Ideally upstream would switch to pkg-config. Or even more ideally, we would incorporate pkg-config into the compiler and not mess with any of this. Meanwhile, this changes gdb's configure to add gmp to the link line when checking for mpfr. gdb/ChangeLog 2018-09-17 Tom Tromey * configure: Rebuild. * configure.ac: Use gmp as a library dependency when checking for mpfr. --- gdb/ChangeLog | 6 ++++++ gdb/configure | 2 +- gdb/configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba2730272db..43c4753860e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-09-17 Tom Tromey + + * configure: Rebuild. + * configure.ac: Use gmp as a library dependency when checking for + mpfr. + 2018-09-17 Pedro Alves * python/py-inferior.c (find_inferior_object): Delete. diff --git a/gdb/configure b/gdb/configure index d92a256f1ff..e011b77414b 100755 --- a/gdb/configure +++ b/gdb/configure @@ -9837,7 +9837,7 @@ fi rpathdirs= ltrpathdirs= names_already_handled= - names_next_round='mpfr ' + names_next_round='mpfr gmp' while test -n "$names_next_round"; do names_this_round="$names_next_round" names_next_round= diff --git a/gdb/configure.ac b/gdb/configure.ac index e38604cb656..f658da84e32 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -682,7 +682,7 @@ if test "${with_mpfr}" = no; then AC_MSG_WARN([MPFR support disabled; some features may be unavailable.]) HAVE_LIBMPFR=no else - AC_LIB_HAVE_LINKFLAGS([mpfr], [], [#include ], + AC_LIB_HAVE_LINKFLAGS([mpfr], [gmp], [#include ], [mpfr_exp_t exp; mpfr_t x; mpfr_frexp (&exp, x, x, MPFR_RNDN);]) if test "$HAVE_LIBMPFR" != yes; then -- 2.30.2