[PATCH/RFA] Fix NATDEPFILES sed expression to comment out cont's

[PATCH/RFA] Fix NATDEPFILES sed expression to comment out cont's

[Jason R Thorpe]

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

The following was submitted as a bug report to NetBSD.  The sed
expression that comments out NATDEPFILES does not comment out
continuation lines.  BSD's make(1) doesn't like this (the \ at
the end of the line is ignored, just as the rest of the line following
the comment character is, as it should be).

The following tweak to the sed expression fixes the problem by also
commenting out continuation lines.

Before:

# NATDEPFILES=infptrace.o inftarg.o fork-child.o \
	corelow.o \
	alphabsd-nat.o alphanbsd-nat.o

After:

# NATDEPFILES= infptrace.o inftarg.o fork-child.o \
#	corelow.o \
#	alphabsd-nat.o alphanbsd-nat.o

OK to commit?

2002-05-10  Christian Limpach  <chris@Pin.LU>

	* configure.in: Change sed expression which comments out
	NATDEPFILES to also comment out continuation lines.
	* configure: Regenerate.

-- 
        -- Jason R. Thorpe <thorpej@wasabisystems.com>

[-- Attachment #2: configure-patch --]
[-- Type: text/plain, Size: 660 bytes --]

Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.86
diff -u -r1.86 configure.in
--- configure.in	11 Apr 2002 18:32:50 -0000	1.86
+++ configure.in	10 May 2002 21:51:29 -0000
@@ -1366,7 +1366,8 @@
 dnl
 if test "${nativefile}" = ""; then
         < Makefile \
-        sed -e '/^NATDEPFILES[[ 	]]*=[[ 	]]*/s//# NATDEPFILES=/' \
+        sed -e '/^NATDEPFILES[[ 	]]*=.*\\$/,/[[^\\]]$/s/^/# /' \
+            -e '/^NATDEPFILES[[ 	]]*=/s/^/# /' \
         | sed -e '/^\(NATDEPFILES[[ 	]]*[[+]]=[[ 	]]*\)/s//# \1/' \
 	> Makefile.tem
 mv -f Makefile.tem Makefile

Re: [PATCH/RFA] Fix NATDEPFILES sed expression to comment out cont's

[Andrew Cagney]

> The following was submitted as a bug report to NetBSD.  The sed
> expression that comments out NATDEPFILES does not comment out
> continuation lines.  BSD's make(1) doesn't like this (the \ at
> the end of the line is ignored, just as the rest of the line following
> the comment character is, as it should be).
> 
> The following tweak to the sed expression fixes the problem by also
> commenting out continuation lines.
> 
> Before:
> 
> # NATDEPFILES=infptrace.o inftarg.o fork-child.o \
> 	corelow.o \
> 	alphabsd-nat.o alphanbsd-nat.o
> 
> After:
> 
> # NATDEPFILES= infptrace.o inftarg.o fork-child.o \
> #	corelow.o \
> #	alphabsd-nat.o alphanbsd-nat.o
> 
> OK to commit?

Hmm, yes.  Can you just use a ``From ..'' style changelog with the 
commit.  Definitly small enough to fit under the (C) wire.

(Any developer can post then [pause] commit Makefile.in or configure.in 
changes.)

> 2002-05-10  Christian Limpach  <chris@Pin.LU>
> 
> 	* configure.in: Change sed expression which comments out
> 	NATDEPFILES to also comment out continuation lines.
> 	* configure: Regenerate.
> 

Andrew

Re: [PATCH/RFA] Fix NATDEPFILES sed expression to comment out cont's

[Jason R Thorpe]

On Fri, May 10, 2002 at 07:50:13PM -0400, Andrew Cagney wrote:

 > Hmm, yes.  Can you just use a ``From ..'' style changelog with the 
 > commit.  Definitly small enough to fit under the (C) wire.

Done.

 > (Any developer can post then [pause] commit Makefile.in or configure.in 
 > changes.)

Ok, noted.

-- 
        -- Jason R. Thorpe <thorpej@wasabisystems.com>