From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-15322-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 2288 invoked by alias); 10 May 2002 21:58:21 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 2281 invoked from network); 10 May 2002 21:58:20 -0000
Received: from unknown (HELO dr-evil.shagadelic.org) (208.176.2.162)
  by sources.redhat.com with SMTP; 10 May 2002 21:58:20 -0000
Received: by dr-evil.shagadelic.org (Postfix, from userid 7518)
	id 299419869; Fri, 10 May 2002 14:58:20 -0700 (PDT)
Date: Fri, 10 May 2002 14:58:00 -0000
From: Jason R Thorpe <thorpej@wasabisystems.com>
To: gdb-patches@sources.redhat.com
Subject: [PATCH/RFA] Fix NATDEPFILES sed expression to comment out cont's
Message-ID: <20020510145819.K3435@dr-evil.shagadelic.org>
Reply-To: thorpej@wasabisystems.com
Mail-Followup-To: Jason R Thorpe <thorpej@wasabisystems.com>,
	gdb-patches@sources.redhat.com
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Cqq5NadOW2RfLMJ/"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Organization: Wasabi Systems, Inc.
X-SW-Source: 2002-05/txt/msg00370.txt.bz2


--Cqq5NadOW2RfLMJ/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-length: 882

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>

--Cqq5NadOW2RfLMJ/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=configure-patch
Content-length: 660

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

--Cqq5NadOW2RfLMJ/--