This is the mail archive of the
gdb@sources.redhat.com
mailing list for the GDB project.
[COMMIT] Fix DJGPP configury stuff
- From: "Eli Zaretskii" <eliz at gnu dot org>
- To: gdb at sourceware dot org
- Date: Thu, 12 May 2005 11:41:48 +0300
- Subject: [COMMIT] Fix DJGPP configury stuff
- Reply-to: Eli Zaretskii <eliz at gnu dot org>
The DJGPP configure scripts suffered some bit-rotting due to recent
changes in Autoconf. The below fixes that.
Committed.
2005-05-12 Eli Zaretskii <eliz@gnu.org>
* config/djgpp/config.sed: Adapt to latest Autoconf.
* config/djgpp/djconfig.sh: Add -Wpointer-arith and
-Wuninitialized to the build warnings.
Index: gdb/config/djgpp/djconfig.sh
===================================================================
RCS file: /cvs/src/src/gdb/config/djgpp/djconfig.sh,v
retrieving revision 1.9
diff -u -r1.9 djconfig.sh
--- gdb/config/djgpp/djconfig.sh 13 Nov 2004 13:36:51 -0000 1.9
+++ gdb/config/djgpp/djconfig.sh 12 May 2005 08:39:18 -0000
@@ -5,7 +5,7 @@
# configuring other GNU programs for DJGPP.
#
#=====================================================================
-# Copyright 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+# Copyright 1997,1999,2000,2001,2002,2003,2005 Free Software Foundation, Inc.
#
# Originally written by Robert Hoehne, revised by Eli Zaretskii.
# This file is part of GDB.
@@ -174,7 +174,7 @@
echo "Running the configure script..."
$srcdir/configure --srcdir="$srcdir" --prefix='${DJDIR}' \
--disable-shared --disable-nls --verbose --enable-build-warnings=\
--Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith $*
+-Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith,-Wuninitialized $*
if test -f ${srcdir}/install- ; then
mv ${srcdir}/install- ${srcdir}/install-.sh
Index: gdb/config/djgpp/config.sed
===================================================================
RCS file: /cvs/src/src/gdb/config/djgpp/config.sed,v
retrieving revision 1.6
diff -u -r1.6 config.sed
--- gdb/config/djgpp/config.sed 13 Nov 2004 13:36:52 -0000 1.6
+++ gdb/config/djgpp/config.sed 12 May 2005 08:39:36 -0000
@@ -3,22 +3,31 @@
/ac_rel_source/s|ln -s|cp -p|
s|\.gdbinit|gdb.ini|g
-/^ac_given_INSTALL=/,/^CEOF/ {
- /^s%@prefix@%/a\
+# Edit Makefiles. This should go near the beginning of
+# the substitutions script, before the branch command that
+# skips any lines without @...@ in them.
+# Any commands that can match again after substitution must
+# do a conditional branch to next cycle (;t), or else Sed might hang.
+/(echo[ ]*':t/a\
s,\\([yp*]\\)\\.tab,\\1_tab,g\
- /^ @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],\
+ s,\\$@\\.tmp,\\$@_tmp,g\
+ s,\\$@\\.new,\\$@_new,g\
+ /^ @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],;t\
s,standards\\.info\\*,standard*.inf*,\
s,configure\\.info\\*,configur*.inf*,\
s,\\.info\\*,.inf* *.i[1-9] *.i[1-9][0-9],\
s,\\.gdbinit,gdb.ini,g\
- /TEXINPUTS=/s,:,';',g\
+ s,@PATH_SEPARATOR@,";",\
+ /TEXINPUTS=/s,:,";",g\
/VPATH *=/s,\\([^A-z]\\):,\\1;,g\
- /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],\
- /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],\
- s,config\\.h\\.in,config.h-in,g\
- s,po2tbl\\.sed\\.in,po2tblsed.in,g
-
-}
+ /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],;t\
+ /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],;t\
+ s,config\\.h\\.in,config.h-in,g;t t\
+ s,po2tbl\\.sed\\.in,po2tblsed.in,g;t t
+
+# Prevent splitting of config.status substitutions, because that
+# might break multi-line sed commands.
+/ac_max_sed_lines=[0-9]/s,=.*$,=`sed -n "$=" $tmp/subs.sed`,
/^ac_given_srcdir=/,/^CEOF/ {
/^s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%/a\