summaryrefslogtreecommitdiff
path: root/mk/buildlink2
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-05 08:27:18 +0000
committerjlam <jlam>2004-02-05 08:27:18 +0000
commit62767c0d7e27f8639962ee9405ffef7a2a09d9b2 (patch)
tree4bc3aa111a2b983317d536f119e142956cb2d36c /mk/buildlink2
parente732b090b38fdc09552111b2dd023c7b2bade373 (diff)
downloadpkgsrc-62767c0d7e27f8639962ee9405ffef7a2a09d9b2.tar.gz
Use the new work log format used by buildlink3. Lines beginning with
"[*]" are the untransformed command lines, and the ones beginning with "<.>" are the ones that are actually executed.
Diffstat (limited to 'mk/buildlink2')
-rw-r--r--mk/buildlink2/libtool.sh7
-rw-r--r--mk/buildlink2/wrapper.sh7
2 files changed, 10 insertions, 4 deletions
diff --git a/mk/buildlink2/libtool.sh b/mk/buildlink2/libtool.sh
index d58f364e2b9..706684905a9 100644
--- a/mk/buildlink2/libtool.sh
+++ b/mk/buildlink2/libtool.sh
@@ -1,6 +1,6 @@
#!@BUILDLINK_SHELL@
#
-# $NetBSD: libtool.sh,v 1.10 2003/09/02 06:59:51 jlam Exp $
+# $NetBSD: libtool.sh,v 1.11 2004/02/05 08:27:18 jlam Exp $
Xsed='@SED@ -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -34,6 +34,9 @@ BUILDLINK_X11_DIR="@BUILDLINK_X11_DIR@"
WRKDIR="@WRKDIR@"
WRKSRC="@WRKSRC@"
+original_cmd="$0 $@"
+$echo [*] $original_cmd >> $wrapperlog
+
cmd="@WRAPPEE@"
lafile=
case "$1" in
@@ -86,7 +89,7 @@ esac
@_BLNK_WRAP_ENV@
@_BLNK_WRAP_SANITIZE_PATH@
-$echo $cmd >> $wrapperlog
+$echo "<.>" $cmd >> $wrapperlog
eval $cmd
wrapper_result=$?
diff --git a/mk/buildlink2/wrapper.sh b/mk/buildlink2/wrapper.sh
index 8368ee7c705..9a0f7aa3875 100644
--- a/mk/buildlink2/wrapper.sh
+++ b/mk/buildlink2/wrapper.sh
@@ -1,6 +1,6 @@
#!@BUILDLINK_SHELL@
#
-# $NetBSD: wrapper.sh,v 1.9 2003/09/02 06:59:52 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.10 2004/02/05 08:27:18 jlam Exp $
Xsed='@SED@ -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -30,6 +30,9 @@ BUILDLINK_X11_DIR="@BUILDLINK_X11_DIR@"
WRKDIR="@WRKDIR@"
WRKSRC="@WRKSRC@"
+original_cmd="$0 $@"
+$echo [*] $original_cmd >> $wrapperlog
+
cmd="@WRAPPEE@"
while $test $# -gt 0; do
arg="$1"; shift
@@ -48,5 +51,5 @@ done
@_BLNK_WRAP_ENV@
@_BLNK_WRAP_SANITIZE_PATH@
-$echo $cmd >> $wrapperlog
+$echo "<.>" $cmd >> $wrapperlog
eval exec $cmd