From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Sat, 13 Feb 2010 18:09:53 +0000 (+0100)
Subject: [PATCH] Support for SystemTap's dtrace compatibility layer and issues linking miniperl
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6e3b7bfa2b063f4ce0c55f84474edb7d2c652387;p=p5sagit%2Fp5-mst-13.2.git

[PATCH] Support for SystemTap's dtrace compatibility layer and issues linking miniperl

SystemTaps' dtrace binary lives in /usr/bin, so add a check to Configure
for that.

Additionally link the dtrace .o file into miniperl, which is an issue
with SystemTap and also reported on p5p to affect OpenSolaris in


Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
---

diff --git a/Configure b/Configure
index 2c3829f..576b88d 100755
--- a/Configure
+++ b/Configure
@@ -30,7 +30,7 @@
 
 # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
 #
-# Generated on Tue Feb  9 16:39:40 CET 2010 [metaconfig 3.5 PL0]
+# Generated on Sat Feb 13 19:05:42 CET 2010 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -7152,6 +7152,8 @@ esac
 
 : DTrace support
 dflt_dtrace='/usr/sbin/dtrace'
+$test -x /usr/bin/dtrace && dflt_dtrace='/usr/bin/dtrace'
+
 cat <<EOM
 
 Perl can be built to support DTrace on platforms that support it.
diff --git a/Makefile.SH b/Makefile.SH
index 6d1fb08..5295dcc 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -477,7 +477,7 @@ obj1 = $(madlyobj) $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$
 obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT)
 obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT)
 
-mini_obj =  $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
+mini_obj =  $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O)
 ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 obj = $(ndt_obj) $(DTRACE_O)