Patch for GNU/kFreeBSD

Patch for GNU/kFreeBSD

[Jon Boden]

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]


Hi

GDB 7.11 needs a tiny fix to build on GNU/kFreeBSD systems. Please can you apply this?

Thanks!

-- 
Jon Boden

ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS!

http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD

[-- Attachment #2: bsd.diff --]
[-- Type: text/x-diff, Size: 414 bytes --]

--- gdb-7.11.orig/gdb/configure.ac
+++ gdb-7.11/gdb/configure.ac
@@ -535,7 +535,7 @@ 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,
+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. ])])
 

Re: Patch for GNU/kFreeBSD

[Yao Qi]

Jon Boden <jon@ubuntubsd.org> writes:

> GDB 7.11 needs a tiny fix to build on GNU/kFreeBSD systems. Please can
> you apply this?

Hi,
Thanks for the patch.  Could you describe what is the build problem
without your patch?  You also need to regenerate configure file, and
include the changes in the patch too.  ChangeLog is needed as well.

Please read https://sourceware.org/gdb/wiki/ContributionChecklist

-- 
Yao (齐尧)

[PATCH] Re: Patch for GNU/kFreeBSD

[Jon Boden]

[-- Attachment #1: Type: text/plain, Size: 885 bytes --]


Hi!

On Mon, May 16, 2016 at 02:08:51PM +0100, Yao Qi wrote:
> Jon Boden <jon@ubuntubsd.org> writes:
> 
> > GDB 7.11 needs a tiny fix to build on GNU/kFreeBSD systems. Please can
> > you apply this?
> 
> Hi,
> Thanks for the patch.  Could you describe what is the build problem
> without your patch?

Yes. 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.

> You also need to regenerate configure file, and
> include the changes in the patch too.  ChangeLog is needed as well.

Done! For ChangeLog:

2016-05-17  Jon Boden  <jon@ubuntubsd.org>

	* configure.ac: Search for libutil-freebsd as alternative to libutil.

Thanks

-- 
Jon Boden

ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS!

http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD

[-- Attachment #2: gdb.diff --]
[-- Type: text/x-diff, Size: 979 bytes --]

diff -ur gdb-7.11.50.20160517.old/gdb/configure gdb-7.11.50.20160517/gdb/configure
--- gdb-7.11.50.20160517.old/gdb/configure	2016-05-16 21:48:40.000000000 -0400
+++ gdb-7.11.50.20160517/gdb/configure	2016-05-17 16:29:07.000000000 -0400
@@ -7074,7 +7074,7 @@
   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 -ur gdb-7.11.50.20160517.old/gdb/configure.ac gdb-7.11.50.20160517/gdb/configure.ac
--- gdb-7.11.50.20160517.old/gdb/configure.ac	2016-05-16 21:48:40.000000000 -0400
+++ gdb-7.11.50.20160517/gdb/configure.ac	2016-05-17 16:29:07.000000000 -0400
@@ -535,7 +535,7 @@
 AM_ZLIB
 
 # On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
-AC_SEARCH_LIBS(kinfo_getvmmap, util,
+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. ])])
 

Re: [PATCH] Re: Patch for GNU/kFreeBSD

[Yao Qi]

Jon Boden <jon@ubuntubsd.org> writes:

> Yes. 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.

Thanks for the explanation.  Could you write this explanation down in
configure.ac close to your change as a comment?  so people can
understand easily why do we check util and util-freebsd.

>
>> You also need to regenerate configure file, and
>> include the changes in the patch too.  ChangeLog is needed as well.
>
> Done! For ChangeLog:
>
> 2016-05-17  Jon Boden  <jon@ubuntubsd.org>
>
> 	* configure.ac: Search for libutil-freebsd as alternative to libutil.

You also need

	* configure: Re-generated.

otherwise, patch is good to me.  If you don't have the account to push
your patch in, I can do it for you.

-- 
Yao (齐尧)

Re: [PATCH] Re: Patch for GNU/kFreeBSD

[Jon Boden]

[-- Attachment #1: Type: text/plain, Size: 835 bytes --]


Hi!

On Thu, May 19, 2016 at 02:33:50PM +0100, Yao Qi wrote:
> Thanks for the explanation.  Could you write this explanation down in
> configure.ac close to your change as a comment?  so people can
> understand easily why do we check util and util-freebsd.

Done that (patch is attached).

> You also need
> 
> 	* configure: Re-generated.
> 
> otherwise, patch is good to me.  If you don't have the account to push
> your patch in, I can do it for you.

I don't have an account, could you do this for me?

Updated ChangeLog entry:

2016-05-21  Jon Boden  <jon@ubuntubsd.org>

	* configure.ac: Search for libutil-freebsd as alternative to libutil.
	* configure: Re-generated.

Thank you

-- 
Jon Boden

ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS!

http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD

[-- Attachment #2: gdb.diff --]
[-- Type: text/x-diff, Size: 1456 bytes --]

diff -ur gdb-7.11.50.20160521.old/gdb/configure gdb-7.11.50.20160521/gdb/configure
--- gdb-7.11.50.20160521.old/gdb/configure	2016-05-20 21:48:46.000000000 -0400
+++ gdb-7.11.50.20160521/gdb/configure	2016-05-21 04:04:14.000000000 -0400
@@ -7050,6 +7050,7 @@
 
 
 # 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 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 -ur gdb-7.11.50.20160521.old/gdb/configure.ac gdb-7.11.50.20160521/gdb/configure.ac
--- gdb-7.11.50.20160521.old/gdb/configure.ac	2016-05-20 21:48:46.000000000 -0400
+++ gdb-7.11.50.20160521/gdb/configure.ac	2016-05-21 04:04:05.000000000 -0400
@@ -535,7 +535,8 @@
 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. ])])
 

Re: [PATCH] Re: Patch for GNU/kFreeBSD

[Yao Qi]

Jon Boden <jon@ubuntubsd.org> writes:

> I don't have an account, could you do this for me?

Your patch is pushed in.

-- 
Yao (齐尧)