This one has been in the queue for over a month now...
Lars J
On Wed, Jun 28, 2000 at 07:02:26PM +0200, Morten Eriksen wrote:
: Hi,
:
: this patch was never applied, so I'm resending it. Let me know if it
: is unacceptable for some reason.
:
: Regards,
: Morten
:
:
: X-From-Line: [EMAIL PROTECTED] Sun Jun 04 18:12:59 2000
: Return-Path: <[EMAIL PROTECTED]>
: Delivered-To: [EMAIL PROTECTED]
: Received: (qmail 12622 invoked from network); 4 Jun 2000 18:12:59 -0000
: Received: from unknown (HELO mescaline.gnu.org) (unknown)
: by unknown with SMTP; 4 Jun 2000 18:12:59 -0000
: Received: (from slist@localhost)
: by mescaline.gnu.org (8.9.1a/8.9.1) id OAA01334;
: Sun, 4 Jun 2000 14:12:56 -0400
: Resent-Date: Sun, 4 Jun 2000 14:12:56 -0400
: Received: from sim.no (IDENT:[EMAIL PROTECTED] [195.1.220.136])
: by mescaline.gnu.org (8.9.1a/8.9.1) with SMTP id NAA32358
: for <[EMAIL PROTECTED]>; Sun, 4 Jun 2000 13:40:09 -0400
: Received: (qmail 12434 invoked by uid 1114); 4 Jun 2000 17:40:02 -0000
: Sender: [EMAIL PROTECTED]
: To: [EMAIL PROTECTED]
: Subject: [PATCH] Another sgi dependency tracking bugfix
: From: Morten Eriksen <[EMAIL PROTECTED]>
: Date: 04 Jun 2000 19:40:02 +0200
: X-Gnus-Mail-Source: file:/var/spool/mail/mortene
: Message-ID: <[EMAIL PROTECTED]>
: User-Agent: Gnus/5.070098 (Pterodactyl Gnus v0.98) Emacs/20.3
: MIME-Version: 1.0
: Content-Type: multipart/mixed; boundary="=-=-="
: Resent-Message-ID: <"Htr8t2.0.ov7.aIfEv"@mescaline.gnu.org>
: Resent-From: [EMAIL PROTECTED]
: X-Mailing-List: <[EMAIL PROTECTED]> archive/latest/3979
: X-Loop: [EMAIL PROTECTED]
: Precedence: list
: Resent-Sender: [EMAIL PROTECTED]
: Lines: 94
: Xref: trh.sim.no swmgt:5958
:
: Hi,
:
: I discovered and fixed another problem with the sgi-style dependency
: tracking: the "-MDupdate" option to SGI MIPSpro C++ compilers won't
: output a file if the sourcecode file to compile does not contain any
: dependencies (a situation which is not as uncommon as it may
: sound).
:
: With the current Automake depcomp code, this will then lead to a
: mangled .Plo file, which again leads to a corrupted Makefile due to
: the "include basename.Plo" scheme.
:
: This patch will check if a "$tmpdepfile" was actually written for each
: source file, and if not; just write a dummy Makefile comment to the
: "$depfile".
:
: Regards,
: Morten Eriksen
:
:
: Index: ChangeLog
: ===================================================================
: RCS file: /cvs/automake/automake/ChangeLog,v
: retrieving revision 1.872
: diff -u -r1.872 ChangeLog
: --- ChangeLog 2000/06/02 23:27:02 1.872
: +++ ChangeLog 2000/06/04 17:27:09
: @@ -1,3 +1,9 @@
: +2000-06-04 Morten Eriksen <[EMAIL PROTECTED]>
: +
: + * depcomp: fixed bug in sgi dependency tracking mode with
: + sourcecode files which does not contain any dependencies to other
: + source files.
: +
: 2000-06-02 Morten Eriksen <[EMAIL PROTECTED]>
:
: * depcomp: workaround for problem with SGI IRIX sed (it can only
:
:
:
: Index: depcomp
: ===================================================================
: RCS file: /cvs/automake/automake/depcomp,v
: retrieving revision 1.7
: diff -u -r1.7 depcomp
: --- depcomp 2000/06/02 23:27:02 1.7
: +++ depcomp 2000/06/04 17:27:23
: @@ -122,20 +122,29 @@
: exit $stat
: fi
: rm -f "$depfile"
: - echo "$object : \\" > "$depfile"
:
: - # Clip off the initial element (the dependent). Don't try to be
: - # clever and remove the tr invocations, as IRIX sed won't handle
: - # lines with more than 8192 characters.
: - tr ' ' '
: + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
: + echo "$object : \\" > "$depfile"
: +
: + # Clip off the initial element (the dependent). Don't try to be
: + # clever and replace this with sed code, as IRIX sed won't handle
: + # lines with more than a fixed number of characters (4096 in
: + # IRIX 6.2 sed, 8192 in IRIX 6.5).
: + tr ' ' '
: ' < "$tmpdepfile" | sed 's/^[^\.]*\.o://' | tr '
: ' ' ' >> $depfile
:
: - tr ' ' '
: + tr ' ' '
: ' < "$tmpdepfile" | \
: ## Some versions of the HPUX 10.20 sed can't process this invocation
: ## correctly. Breaking it into two sed invocations is a workaround.
: - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
: + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
: + else
: + # The sourcefile does not contain any dependencies, so just
: + # store a dummy comment line, to avoid errors with the Makefile
: + # "include basename.Plo" scheme.
: + echo "#dummy" > "$depfile"
: + fi
: rm -f "$tmpdepfile"
: ;;
:
