summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.Merijn Brand <h.m.brand@xs4all.nl>2010-02-13 19:09:53 +0100
committerH.Merijn Brand <h.m.brand@xs4all.nl>2010-02-13 19:09:53 +0100
commit6e3b7bfa2b063f4ce0c55f84474edb7d2c652387 (patch)
tree55f00a1c87f737c031b8d7819f808d5194aa441c
parent95c9bfa39f7dd11d255e4266e33aafe9d36750e0 (diff)
downloadperl-6e3b7bfa2b063f4ce0c55f84474edb7d2c652387.tar.gz
[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>
-rwxr-xr-xConfigure4
-rw-r--r--Makefile.SH2
2 files changed, 4 insertions, 2 deletions
diff --git a/Configure b/Configure
index 2c3829fd79..576b88d1d2 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 6d1fb082f8..5295dcc5f8 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)