Re: [PATCH 0/2] Move readline down one level

[Simon Marchi <simark at simark dot ca>]

On 2019-10-07 6:23 p.m., Tom Tromey wrote:
>>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:
> 
> Tom> Patch #1 explains this in more detail, ...
> 
> That didn't come though, probably due to size.  Here it is gzipped, but
> I've also added the commit text inline for easier reading.
> 
> Tom

Hi Tom,

I'm confused, the patch you sent as attachment doesn't seem to match the commit
message below.

The one in the attachment is titled "Do not accidentally include in-tree readline
headers".  It sounds like it is a previous way of fixing the same problem?

If you could push that to a users/ branch (or Gerrit), it would help.

Simon

> 
> commit a41d5ef1594c3f89c8054eddd9963ec01970dc89
> Author: Tom Tromey <tom@tromey.com>
> Date:   Sat Oct 5 16:39:44 2019 -0600
> 
>   Move readline to the readline/readline subdirectory
>   
>   readline turns out to be a bit of a stumbling block for the project to
>   move gdbsupport (and then gdbserver) to the top-level.
>   
>   The issue is that readline headers are intended to be included with
>   names like "readline/readline.h".  To support this, gdb effectively
>   adds a -I option pointing to the top-level source directory -- but,
>   importantly, this option is not used when the system readline is used.
>   
>   For gdbsupport, a -I option like this would always be needed, but that
>   in turn would break the system readline case.  This was PR build/17077,
>   fixed in commit a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.
>   
>   Previously, we had discussed this on the gdb-patches list in terms of
>   removing readline from the tree
>   
>       https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html
>   
>   However, Eli expressed some concerns, and Joel did as well (off-list).
>   
>   Given those concerns, and the fact that a patch-free local readline is
>   relatively new in gdb (it was locally patched for years), I changed my
>   mind and decided to handle this situation by moving the readline
>   sources down a level.
>   
>   That is, upstream readline is now in readline/readline, and the
>   top-level readline directory just contains the minimal configury
>   needed to build that.
>   
>   This fixes the problem because, when gdb unconditionally adds a
>   -I$(top_srcdir), this will not find readline headers.  A separate -I
>   will be needed instead, which is exactly what's needed for
>   --with-system-readline.
>   
>   gdb/ChangeLog
>   2019-10-07  Tom Tromey  <tom@tromey.com>
>   
>           * Makefile.in (READLINE_DIR): Update.
>   
>   gdb/doc/ChangeLog
>   2019-10-07  Tom Tromey  <tom@tromey.com>
>   
>           * Makefile.in (READLINE_DIR): Update.
>   
>   readline/ChangeLog
>   2019-10-07  Tom Tromey  <tom@tromey.com>
>   
>           Move old contents to readline/ subdirectory.
>           * aclocal.m4, configure, configure.ac, .gitignore, Makefile.am,
>           Makefile.in, README: New files.
> 
>