From 92a727735347cf71e12ad600d8853b59cd25a22a Mon Sep 17 00:00:00 2001
From: Dimitar Zhekov <jimmy@is-vn.bg>
Date: Tue, 9 Sep 2003 23:11:42 +0000
Subject: [PATCH] Dimitar Zhekov <jimmy@is-vn.bg>: This links gdb against the
 installed [shared] readline library. There were 2 versions (IIRC) of gdb
 since the latest rl was released, and there will probably be another 2 before
 the newest rl is included. Works since 1.5.XX...

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1367 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE  |  2 +-
 package/base/gdb/dont-install-this.patch | 39 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 29240c3cd..bd498525f 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -16,7 +16,7 @@
                    2nd_stage_small incl. further space optimizations, cleanup
                    of some stone modules and a shell gasgui implementation,
                    fixed the new linux configuration code for the none-style
-                   case
+                   case, fixed gdb to use the installed readline
  - fixed linux24-src for treever non-numeric content (e.g. linux24benh-src)
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
diff --git a/package/base/gdb/dont-install-this.patch b/package/base/gdb/dont-install-this.patch
index ddff53f07..918c85554 100644
--- a/package/base/gdb/dont-install-this.patch
+++ b/package/base/gdb/dont-install-this.patch
@@ -41,6 +41,17 @@
  uninstall-am: uninstall-bfdlibLTLIBRARIES
  uninstall: uninstall-recursive
  all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
+--- ./configure.orig	2002-05-31 23:09:45.000000000 +0300
++++ ./configure	2003-08-27 14:59:37.000000000 +0300
+@@ -527,6 +527,8 @@
+ moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'`
+ ## the sed command below emulates the dirname command
+ topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; ${PWDCMD-pwd}`
++# the readline package in rock-linux is recent enough
++${remove} -f ${topsrcdir}/readline/configure*
+ 
+ 
+ # this is a hack.  sun4 must always be a valid host alias or this will fail.
 --- ./etc/Makefile.in.orig	Sat Jan 26 22:35:45 2002
 +++ ./etc/Makefile.in	Sat Jan 18 19:59:43 2003
 @@ -52,7 +52,8 @@
@@ -53,6 +64,34 @@
  
  uninstall:
  
+--- ./gdb/defs.h.orig	2002-08-01 20:18:32.000000000 +0300
++++ ./gdb/defs.h	2003-08-27 14:53:36.000000000 +0300
+@@ -614,10 +614,6 @@
+ 
+ struct frame_info;
+ 
+-/* From readline (but not in any readline .h files).  */
+-
+-extern char *tilde_expand (char *);
+-
+ /* Control types for commands */
+ 
+ enum misc_command_type
+--- ./gdb/Makefile.in.orig	2002-11-26 00:05:38.000000000 +0200
++++ ./gdb/Makefile.in	2003-08-27 14:55:25.000000000 +0300
+@@ -370,10 +370,10 @@
+ INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty \
+ 	$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+ 	-lmmalloc -lintl -liberty
+-CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(INTL) $(LIBIBERTY) \
++CLIBS = $(SIM) $(BFD) -lreadline $(OPCODES) $(INTL) $(LIBIBERTY) \
+ 	$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+ 	$(MMALLOC) $(LIBIBERTY) $(WIN32LIBS)
+-CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
++CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
+ 	$(OPCODES) $(MMALLOC) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
+ 
+ ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 --- ./libiberty/Makefile.in.orig	Mon Jul  1 20:02:30 2002
 +++ ./libiberty/Makefile.in	Sat Jan 18 20:05:39 2003
 @@ -259,20 +259,20 @@