aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortmm1 <tmm1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-17 02:03:09 +0000
committertmm1 <tmm1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-17 02:03:09 +0000
commit7c51c8fd17ce5c602f8d08adefa6977ade9219f1 (patch)
treebca934c7c94a9251d66cae693ab66c1fd113b41e
parente80f2c118a557f8e387b8b7ab0a1de7a5b3dc1e2 (diff)
downloadruby-7c51c8fd17ce5c602f8d08adefa6977ade9219f1.tar.gz
configure.in: build probes with systemtap's dtrace wrapper
* configure.in (RUBY_DTRACE_POSTPROCESS): Fix compatibility with systemtap on linux. stap requires `dtrace -G` post-processing, but the dtrace compatibility wrapper is very strict about probes.d syntax. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in6
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc5658652d..1cfb424152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 17 10:48:04 2013 Aman Gupta <ruby@tmm1.net>
+
+ * configure.in (RUBY_DTRACE_POSTPROCESS): Fix compatibility with
+ systemtap on linux. stap requires `dtrace -G` post-processing, but
+ the dtrace compatibility wrapper is very strict about probes.d
+ syntax.
+
Tue Dec 17 05:18:17 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems
diff --git a/configure.in b/configure.in
index 6d5e6c8d48..c54b4a347c 100644
--- a/configure.in
+++ b/configure.in
@@ -584,7 +584,11 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
[AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g,
[
if {
- echo "provider conftest{ probe fire(); };" > conftest_provider.d &&
+ cat >conftest_provider.d <<_PROBES &&
+ provider conftest {
+ probe fire();
+ };
+_PROBES
dtrace -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
cat >conftest.c <<_CONF &&
@%:@include "conftest_provider.h"