pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Put more debugging information in .work....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e3c5b8980b3
branches:  trunk
changeset: 466627:8e3c5b8980b3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 21 13:52:56 2004 +0000

description:
Put more debugging information in .work.log: first output the command the
wrapper script will transform, then output the transformed command.
Prefix the original command with [*] and the transformed command with <.>
to ease scanning of .work.log.

diffstat:

 mk/buildlink3/libtool.sh |  7 +++++--
 mk/buildlink3/wrapper.sh |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r c6e8fbb18dea -r 8e3c5b8980b3 mk/buildlink3/libtool.sh
--- a/mk/buildlink3/libtool.sh  Wed Jan 21 13:11:09 2004 +0000
+++ b/mk/buildlink3/libtool.sh  Wed Jan 21 13:52:56 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: libtool.sh,v 1.10 2004/01/11 03:30:20 grant Exp $
+# $NetBSD: libtool.sh,v 1.11 2004/01/21 13:52:56 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -40,6 +40,9 @@
 # Argument buffers
 buf1=; buf2=; buf3=; buf4=; buf5=
 
+original_cmd="$0 $@"
+$echo [*] $original_cmd >> $wrapperlog
+
 # Discover the libtool mode by examining the argument list.
 mode=link
 prevopt=
@@ -162,7 +165,7 @@
 @_BLNK_WRAP_ENV@
 @_BLNK_WRAP_SANITIZE_PATH@
 
-$echo $cmd >> $wrapperlog
+$echo "<.>" $cmd >> $wrapperlog
 eval $cmd
 wrapper_result=$?
 
diff -r c6e8fbb18dea -r 8e3c5b8980b3 mk/buildlink3/wrapper.sh
--- a/mk/buildlink3/wrapper.sh  Wed Jan 21 13:11:09 2004 +0000
+++ b/mk/buildlink3/wrapper.sh  Wed Jan 21 13:52:56 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: wrapper.sh,v 1.6 2003/11/26 12:52:30 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.7 2004/01/21 13:52:56 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -37,6 +37,9 @@
 # Argument buffers
 buf1=; buf2=; buf3=; buf4=; buf5=
 
+original_cmd="$0 $@"
+$echo [*] $original_cmd >> $wrapperlog
+
 cmd="@WRAPPEE@"
 set -- "$@" @_BLNK_WRAP_EXTRA_FLAGS@
 while $test $# -gt 0 -o -n "${buf1}${buf2}${buf3}${buf4}${buf5}"; do
@@ -73,5 +76,5 @@
 @_BLNK_WRAP_ENV@
 @_BLNK_WRAP_SANITIZE_PATH@
 
-$echo $cmd >> $wrapperlog
+$echo "<.>" $cmd >> $wrapperlog
 eval exec $cmd



Home | Main Index | Thread Index | Old Index