Patchwork [1/9] Allow GDB to build against unreleased Guile 2.2

login
register
mail settings
Submitter Andy Wingo
Date April 9, 2014, 4:13 p.m.
Message ID <1397060028-18158-2-git-send-email-wingo@igalia.com>
Download mbox | patch
Permalink /patch/457/
State Changes Requested
Headers show

Comments

Andy Wingo - April 9, 2014, 4:13 p.m.
* gdb/configure:
* gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.
---
 gdb/configure    | 5 +++--
 gdb/configure.ac | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
Doug Evans - April 12, 2014, 4:40 p.m.
Andy Wingo <wingo@igalia.com> writes:

> * gdb/configure:
> * gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.
> ---
>  gdb/configure    | 5 +++--
>  gdb/configure.ac | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gdb/configure b/gdb/configure
> index fd61bb5..307c6c9 100755
> --- a/gdb/configure
> +++ b/gdb/configure
> @@ -3,7 +3,7 @@
>  # Generated by GNU Autoconf 2.64.
>  #
>  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
> -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
> +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014 Free Software
>  # Foundation, Inc.
>  #
>  # This configure script is free software; the Free Software Foundation
> @@ -8750,7 +8750,8 @@ fi
>  
>  
>  
> -try_guile_versions="guile-2.0"
> +
> +try_guile_versions="guile-2.2 guile-2.0"
>  have_libguile=no
>  case "${with_guile}" in
>  no)
> diff --git a/gdb/configure.ac b/gdb/configure.ac
> index 494d711..ff84a2e 100644
> --- a/gdb/configure.ac
> +++ b/gdb/configure.ac
> @@ -1154,7 +1154,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.0"
> +try_guile_versions="guile-2.2 guile-2.0"
>  have_libguile=no
>  case "${with_guile}" in
>  no)

Hi.

This is ok with two nits:

1) ChangeLog entries are included in the email as they appear in the file
itself (but not as a patch).  E.g., for future reference, replace

* gdb/configure:
* gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.

with

2014-04-09  Andy Wingo  <wingo@igalia.com>

	* gdb/configure:
	* gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.

I realize it can be cumbersome, but it's the convention we have.

2) The change to configure is small, so it's not a big a deal,
but, for reference sake, the convention here is to not include changes
to machine generated files in patches submitted to the list.
Plus I wouldn't expect a change to the Copyright year in configure.

---

As I say these are just nits, but they are community rules so I'm
obligated to forward them on.

btw, this patch is small enough to not require one, and while I wouldn't
doubt that you have a copyright assignment for Guile changes :-), do you
have one for gdb?  I can imagine having a blanket assignment for
everything, just checking.
Doug Evans - April 12, 2014, 4:47 p.m.
On Sat, Apr 12, 2014 at 9:40 AM, Doug Evans <xdje42@gmail.com> wrote:
> This is ok with two nits:
>
> 1) ChangeLog entries are included in the email as they appear in the file
> itself (but not as a patch).  E.g., for future reference, replace
>
> * gdb/configure:
> * gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.
>
> with
>
> 2014-04-09  Andy Wingo  <wingo@igalia.com>
>
>         * gdb/configure:
>         * gdb/configure.ac (try_guile_versions): Allow building with guile 2.2.

Oops.  Make that

2014-04-09  Andy Wingo  <wingo@igalia.com>

         * configure: Regenerate.
         * configure.ac (try_guile_versions): Allow building with guile 2.2.

Paths in ChangeLog files are relative to the location of the ChangeLog file.
And convention is to write "Regenerate" for machine generated files.

Plus, instead of "replace" I should have probably said "in addition to".
Feel free to include whatever git spits out of course, but current
community rules require the ChangeLog entry included in the emailed
patch as shown above.
[There is debate on how to improve this, but I don't think the
community has agreed to anything yet.]
Andy Wingo - April 17, 2014, 9:04 a.m.
Hi,

Thanks for the review.  I'll post a new patchset shortly incorporating
feedback.  Sorry for the gaffe with the changelogs.

On Sat 12 Apr 2014 18:40, Doug Evans <xdje42@gmail.com> writes:

> 2) The change to configure is small, so it's not a big a deal,
> but, for reference sake, the convention here is to not include changes
> to machine generated files in patches submitted to the list.
> Plus I wouldn't expect a change to the Copyright year in configure.

I edited the file manually as I don't have autoconf2.64 on my system,
hence the copyright year update.  I removed the copyright update from
the updated patchset, but kept the change to the generated configure
file as it's so trivial that I can only imagine autoconf producing
exactly those changes.  I can repost that patch without that change if
you like.

> btw, this patch is small enough to not require one, and while I wouldn't
> doubt that you have a copyright assignment for Guile changes :-), do you
> have one for gdb?  I can imagine having a blanket assignment for
> everything, just checking.

I was agnozing over having to do that when I found to my pleasant
surprise that Igalia already has a corporate assignment for GDB, made
when Sanjoy Das was doing the custom debug info JIT interface stuff a
couple years ago.  Hopefully that suffices.

Cheers,

Andy

Patch

diff --git a/gdb/configure b/gdb/configure
index fd61bb5..307c6c9 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -3,7 +3,7 @@ 
 # Generated by GNU Autoconf 2.64.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014 Free Software
 # Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -8750,7 +8750,8 @@  fi
 
 
 
-try_guile_versions="guile-2.0"
+
+try_guile_versions="guile-2.2 guile-2.0"
 have_libguile=no
 case "${with_guile}" in
 no)
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 494d711..ff84a2e 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1154,7 +1154,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.0"
+try_guile_versions="guile-2.2 guile-2.0"
 have_libguile=no
 case "${with_guile}" in
 no)