[binutils-gdb] Search for libutil-freebsd as alternative to libutil

[Yao Qi <qiyao at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=37773e7803b370802302719a48c9c46f64c602b4

commit 37773e7803b370802302719a48c9c46f64c602b4
Author: Jon Boden <jon@ubuntubsd.org>
Date:   Mon May 23 08:46:33 2016 +0100

    Search for libutil-freebsd as alternative to libutil
    
    GDB needs kinfo_getvmmap() on GNU/kFreeBSD systems same as on
    pure FreeBSD.  However on these systems the FreeBSD version of libutil
    is renamed to libutil-freebsd.
    
    2016-05-23  Jon Boden  <jon@ubuntubsd.org>
    
    	* configure.ac: Search for libutil-freebsd as alternative to libutil.
    	* configure: Re-generated.

Diff:
---
 gdb/ChangeLog    | 5 +++++
 gdb/configure    | 3 ++-
 gdb/configure.ac | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0968b85..e0db33c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-23  Jon Boden  <jon@ubuntubsd.org>  (tiny change)
+
+	* configure.ac: Search for libutil-freebsd as alternative to libutil.
+	* configure: Re-generated.
+
 2016-05-19  Andreas Schwab  <schwab@suse.de>
 
 	* ia64-libunwind-tdep.c (libunwind_descr): Add cast from void *.
diff --git a/gdb/configure b/gdb/configure
index c9cd3ba..60ea884 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7050,6 +7050,7 @@ fi
 
 
 # On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
+# On GNU/kFreeBSD systems, FreeBSD libutil is renamed to libutil-freebsd.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing kinfo_getvmmap" >&5
 $as_echo_n "checking for library containing kinfo_getvmmap... " >&6; }
 if test "${ac_cv_search_kinfo_getvmmap+set}" = set; then :
@@ -7074,7 +7075,7 @@ return kinfo_getvmmap ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' util; do
+for ac_lib in '' util util-freebsd; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 4364c02..6a72f72 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -535,7 +535,8 @@ AC_SEARCH_LIBS(socketpair, socket)
 AM_ZLIB
 
 # On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
-AC_SEARCH_LIBS(kinfo_getvmmap, util,
+# On GNU/kFreeBSD systems, FreeBSD libutil is renamed to libutil-freebsd.
+AC_SEARCH_LIBS(kinfo_getvmmap, util util-freebsd,
   [AC_DEFINE(HAVE_KINFO_GETVMMAP, 1,
             [Define to 1 if your system has the kinfo_getvmmap function. ])])