Re: readline rebase 5.1->6.2?

[Jan Kratochvil <jan.kratochvil@redhat.com>]

On Fri, 01 Apr 2011 11:30:03 +0200, Eli Zaretskii wrote:
> I only paid attention to DJGPP/MSDOS-specific patches and to MinGW-specific
> patches, because Jan seemed to have covered the rest.

I hadn't yet, I have done so now.  I have checked the remaining changes and
these (mostly minor) patches should be applied on top of readline-6.2:
	[Bug-readline] [RFC/readline] bind.c, rl_function_dumper, Free allocated
	http://lists.gnu.org/archive/html/bug-readline/2011-03/msg00000.html
	[Bug-readline] Unused support/wcwidth.c
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00000.html
	[Bug-readline] [patch] Fix underquotation in readline/examples/rlfe/conf
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00001.html
	[Bug-readline] [patch] Makefile.in htm<->html
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00002.html
	Re: [Bug-readline] [patch] Makefile.in dependency: callback.o: xmalloc.h
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00004.html
	[Bug-readline] [patch] Remove . from the VPATH directive
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00005.html

Together with the sourceware-specific changes which are not suitable for
upstream readline, provided below.  And together with the changes as found by
Eli.

So I believe it is ready for a rebase after the 7.3 branching.

I haven't commented here the diff parts which I have found already present in
readline-6.2, I can do so upon request.  The 5.1patched -> 6.2 change should
be done probably by a single commit - and not as 6.2 pristine + the several
changes below - as otherwise there would be a local build regression which
complicates git bisect.


Thanks,
Jan


This ChangeLog should not go anywhere, these entries are already present in
readline/ChangeLog.gdb.

commit fe454715791b86ad488b33c1f325478803c8108c - import gdb-19990422 snapshot
1999-04-22  Jason Molenda  <jsm@bugshack.cygnus.com>

	* Makefile.in (install): Make comment about this change more explicit.

1999-04-22  Jason Molenda  <jsm@bugshack.cygnus.com>

	* Makefile.in (install): Don't install the final libreadline.a
	or .h files.

commit 47add2a0e5b7e970014e000ac1a3a1cc42c31798
2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.in: m4_include toplevel config/override.m4.
	* configure: Regenerate.

commit 14cd51f7793a9ce07bc435069f57269450141363 - Initial revision
 - unaware where that AC_CONFIG_AUX_DIR change came from.

commit 1809460e45c24a51bcbac82243cad09117cd43c5
2002-12-16  Christopher Faylor  <cgf@redhat.com>

	* configure.in: Remove --enable-shared option.  It shouldn't be used
	for gdb.
	* configure: Regenerate.

commit 14cd51f7793a9ce07bc435069f57269450141363 - Initial revision
Tue Dec 29 18:11:28 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>

	* cross-build/cygwin.cache: new file. Used for Cygwin cross builds.

--- readline-6.2-orig/Makefile.in	2010-10-11 17:53:52.000000000 +0200
+++ readline-6.2/Makefile.in	2011-04-02 21:22:36.000000000 +0200
@@ -211,7 +211,17 @@ examples: force
 
 force:
 
-install:	$(INSTALL_TARGETS)
+## GDB LOCAL
+## Don't mess with people's installed readline's.
+## This tries to install this version of readline over whatever
+## version is already installed on the system (which could be a
+## newer version). There is no real reason for us to install
+## readline along with GDB. GDB links statically against readline,
+## so it doesn't depend on us installing it on the system.
+
+install:
+
+#install:	$(INSTALL_TARGETS)
 
 install-headers: installdirs ${INSTALLED_HEADERS}
 	for f in ${INSTALLED_HEADERS}; do \
--- readline-6.2-orig/examples/rlfe/configure.in	2006-11-09 16:51:12.000000000 +0100
+++ readline-6.2/examples/rlfe/configure.in	2011-04-02 21:22:36.000000000 +0200
@@ -1,5 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
+m4_include([../../../config/override.m4])
+
 AC_INIT(rlfe.c)
 AC_CONFIG_HEADER(config.h)
 VERSION=0.4
--- readline-6.2-orig/configure.in	2010-11-14 23:41:48.000000000 +0100
+++ readline-6.2/configure.in	2011-04-02 21:23:07.000000000 +0200
@@ -22,13 +22,17 @@ dnl Process this file with autoconf to p
 
 AC_REVISION([for Readline 6.2, version 2.67])
 
+m4_include([../config/override.m4])
+
 AC_INIT(readline, 6.2, bug-readline@gnu.org)
 
 dnl make sure we are using a recent autoconf version
 AC_PREREQ(2.50)
 
 AC_CONFIG_SRCDIR(readline.h)
-AC_CONFIG_AUX_DIR(./support)
+dnl GDB LOCAL
+dnl AC_CONFIG_AUX_DIR(./support)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
 AC_CONFIG_HEADERS(config.h)
 
 dnl update the value of RL_READLINE_VERSION in readline.h when this changes
@@ -57,10 +61,10 @@ fi
 dnl option parsing for optional features
 opt_multibyte=yes
 opt_static_libs=yes
-opt_shared_libs=yes
+opt_shared_libs=no
 
 AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval)
-AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
+dnl AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
 AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval)
 
 if test $opt_multibyte = no; then
--- readline-6.2-orig/cross-build/cygwin.cache	1970-01-01 01:00:00.000000000 +0100
+++ readline-6.2/cross-build/cygwin.cache	2011-04-02 21:22:36.000000000 +0200
@@ -0,0 +1,46 @@
+# This file is a shell script that caches the results of configure
+# tests for CYGWIN32 so they don't need to be done when cross-compiling.
+
+# AC_FUNC_GETPGRP should also define GETPGRP_VOID
+ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void='yes'}
+# AC_FUNC_SETVBUF_REVERSED should not define anything else
+ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed='no'}
+# on CYGWIN32, system calls do not restart
+ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls='no'}
+bash_cv_sys_restartable_syscalls=${bash_cv_sys_restartable_syscalls='no'}
+
+# these may be necessary, but they are currently commented out
+#ac_cv_c_bigendian=${ac_cv_c_bigendian='no'}
+ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p='4'}
+ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
+ac_cv_sizeof_long=${ac_cv_sizeof_long='4'}
+
+bash_cv_dup2_broken=${bash_cv_dup2_broken='no'}
+bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe='no'}
+bash_cv_type_rlimit=${bash_cv_type_rlimit='long'}
+bash_cv_decl_under_sys_siglist=${bash_cv_decl_under_sys_siglist='no'}
+bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist='no'}
+bash_cv_sys_siglist=${bash_cv_sys_siglist='no'}
+bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust='no'}
+bash_cv_getenv_redef=${bash_cv_getenv_redef='yes'}
+bash_cv_printf_declared=${bash_cv_printf_declared='yes'}
+bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds='no'}
+bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen='no'}
+bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers='no'}
+bash_cv_job_control_missing=${bash_cv_job_control_missing='present'}
+bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes='missing'}
+bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp='present'}
+bash_cv_mail_dir=${bash_cv_mail_dir='unknown'}
+bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken='no'}
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t='yes'}
+
+bash_cv_type_int32_t=${bash_cv_type_int32_t='int'}
+bash_cv_type_u_int32_t=${bash_cv_type_u_int32_t='int'}
+ac_cv_header_termcap_h=${ac_cv_header_termcap_h='yes'}
+ac_cv_header_termios_h=${ac_cv_header_termios_h='yes'}
+bash_cv_termcap_lib=${bash_cv_termcap_lib='-ltermcap'}
+
+bash_cv_tiocgwinsz_in_ioctl=${bash_cv_tiocgwinsz_in_ioctl='yes'}
+ac_cv_lib_termcap_tgetent=${ac_cv_lib_termcap_tgetent='yes'}
+
+# end of cross-build/cygwin32.cache